jiebi/CodeConvo huggingface dataset:
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper <del> , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs </del> <ins> , addOpenGLRunpath, docutils, perl, pkgconfig, python3, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs </ins> , nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? stdenv.isLinux
${wrapperFlags} ''; <ins> # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. postFixup = optionalString stdenv.isLinux '' addOpenGLRunpath $out/bin/.mpv-wrapped ''; </ins> meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = https://mpv.io; license = licenses.gpl2Plus; <del> maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ]; </del> <ins> maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ]; </ins> platforms = platforms.darwin ++ platforms.linux; longDescription = ''
<del> { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm </del> <ins> { stdenv, fetchurl, pkgconfig, addOpenGLRunpath, perl, texinfo, yasm </ins> , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
"--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; <del> nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; </del> <ins> nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; </ins> buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
substituteInPlace $pc  --replace "includedir=$out" "includedir=''${!outputInclude}" done <ins> '' + optionalString stdenv.isLinux '' # Set RUNPATH so that libnvcuvid in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. addOpenGLRunpath $out/lib/libavcodec.so* </ins> ''; installFlags = [ "install-man" ];
maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; <ins> propagatedUserEnvPkgs = [ baloo ]; </ins> propagatedBuildInputs = [ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
]; checkInputs = [ pytest ]; <ins> patches = [ # Fixes tests by changing threshold of a test-case that broke # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. ( fetchpatch { url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; }) ]; </ins> LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64;
{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }: <del> stdenv.mkDerivation rec { pname = "libwebsockets"; version = "3.2.0"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; </del> <ins> let generic = { version, sha256 }: stdenv.mkDerivation rec { pname = "libwebsockets"; inherit version; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; inherit sha256; }; buildInputs = [ openssl zlib libuv ]; nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; longDescription = '' Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions. ''; homepage = "https://libwebsockets.org/"; license = licenses.lgpl21; platforms = platforms.all; }; </ins> }; <del> buildInputs = [ cmake openssl zlib libuv ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; meta = { description = "Light, portable C library for websockets"; longDescription = '' Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions. ''; homepage = https://github.com/warmcat/libwebsockets; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.all; </del> <ins> in rec { libwebsockets_3_1 = generic { sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; version = "3.1.0"; </ins> }; <ins> libwebsockets_3_2 = generic { version = "3.2.0"; sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; }; libwebsockets = libwebsockets_3_2; </ins> }
{ stdenv, lib, fetchFromGitHub, cmake, docbook_xsl, libxslt <del> , openssl, libuuid, libwebsockets, c-ares, libuv </del> <ins> , openssl, libuuid, libwebsockets_3_1, c-ares, libuv </ins> , systemd ? null, withSystemd ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "mosquitto"; <del> version = "1.6.4"; </del> <ins> version = "1.6.5"; </ins> src = fetchFromGitHub { owner  = "eclipse"; repo   = "mosquitto"; rev    = "v${version}"; <del> sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; </del> <ins> sha256 = "0scgsi3rvs9s8vxv4r7d5d9ixbsfg4dwnjcy6zxwdz9dfn8qnngj"; </ins> }; postPatch = ''
librest = callPackage ../development/libraries/librest { }; <del> libwebsockets = callPackage ../development/libraries/libwebsockets { }; </del> <ins> inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 libwebsockets; </ins> lidarr = callPackage ../servers/lidarr { };
postgresql_10 postgresql_11 ; <del> postgresql = postgresql_9_6.override { this = postgresql; }; </del> <ins> postgresql = postgresql_11.override { this = postgresql; }; </ins> postgresqlPackages = recurseIntoAttrs postgresql.pkgs; <del> postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; </del> <ins> postgresql11Packages = pkgs.postgresqlPackages; </ins> postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
assertions = [ { assertion = !config.services.xserver.libinput.enable; <del> message = "cmt and libinput are incompatible, you cannot enable both (in services.xserver)."; </del> <ins> message = '' cmt and libinput are incompatible, meaning you cannot enable them both. To use cmt you need to disable libinput with `services.xserver.libinput.enable = false` If you haven't enabled it in configuration.nix, it's enabled by default on a different xserver module. ''; </ins> } ]; };
<ins> diff --git a/configure.py b/configure.py index 25ca951ac..454140420 100755 --- a/configure.py +++ b/configure.py @@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp" configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]]) -for line in open('/etc/os-release'): -    key, _, value = line.partition('=') -    value = value.strip().strip('"') -    if key == 'ID': -        os_ids = [value] -    if key == 'ID_LIKE': -        os_ids += value.split(' ') +try: +    for line in open('/etc/os-release'): +        key, _, value = line.partition('=') +        value = value.strip().strip('"') +        if key == 'ID': +            os_ids = [value] +        if key == 'ID_LIKE': +            os_ids += value.split(' ') +except FileNotFoundError: +    os_ids = ["linux"] # distribution "internationalization", converting package names. </ins>
postPatch = '' patchShebangs ./configure.py <ins> patchShebangs seastar/json/json2code.py </ins> ''; configurePhase = '' ./configure.py --mode=release ''; installPhase = '' mkdir $out cp -r * $out/ ''; meta = with stdenv.lib; { description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; homepage = "https://scylladb.com";
sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc"; }; <del> patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch # GLib contains many binaries used for different purposes; # we will install them to different outputs: # 1. Tools for desktop environment ($bin) #    * gapplication (non-darwin) #    * gdbus #    * gio #    * gio-launch-desktop (symlink to $out) #    * gsettings # 2. Development/build tools ($dev) #    * gdbus-codegen #    * gio-querymodules #    * glib-compile-resources #    * glib-compile-schemas #    * glib-genmarshal #    * glib-gettextize #    * glib-mkenums #    * gobject-query #    * gresource #    * gtester #    * gtester-report # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) #    * gio-launch-desktop ./split-dev-programs.patch ]; </del> <ins> patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch # fix loading dylibs on darwin # Remove on 2.62.1 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch"; sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf"; }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch # GLib contains many binaries used for different purposes; # we will install them to different outputs: # 1. Tools for desktop environment ($bin) #    * gapplication (non-darwin) #    * gdbus #    * gio #    * gio-launch-desktop (symlink to $out) #    * gsettings # 2. Development/build tools ($dev) #    * gdbus-codegen #    * gio-querymodules #    * glib-compile-resources #    * glib-compile-schemas #    * glib-genmarshal #    * glib-gettextize #    * glib-mkenums #    * gobject-query #    * gresource #    * gtester #    * gtester-report # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) #    * gio-launch-desktop ./split-dev-programs.patch ] ++ optional doCheck ./skip-timer-test.patch; </ins> outputs = [ "bin" "out" "dev" "devdoc" ];
stdenv.mkDerivation rec { pname = "igraph"; <del> version = "0.7.1"; </del> <ins> version = "0.8.2"; </ins> src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; <del> sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; </del> <ins> sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; </ins> }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; <del> # This file is normally generated by igraph's bootstrap.sh, but we can do it # ourselves. ~ C. </del> <ins> # Normally, igraph wants us to call bootstrap.sh, which will call # tools/getversion.sh. Instead, we're going to put the version directly # where igraph wants, and then let autoreconfHook do the rest of the # bootstrap. ~ C. </ins> postPatch = '' <del> echo "${version}" > VERSION </del> <ins> echo "${version}" > IGRAPH_VERSION </ins> ''; <ins> doCheck = true; </ins> meta = { description = "The network analysis package"; homepage = "https://igraph.org/"; license = lib.licenses.gpl2; <ins> # NB: Known to fail tests on aarch64. platforms = [ "x86_64-linux" ]; </ins> maintainers = [ lib.maintainers.MostAwesomeDude ]; }; }
nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; <ins> propagatedBuildInputs = [ texttable ]; </ins> src = fetchPypi { inherit pname version; sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; }; <ins> # NB: We want to use our igraph, not vendored igraph, but even with # pkg-config on the PATH, their custom setup.py still needs to be explicitly # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; </ins> doCheck = !isPy3k; meta = {
sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2"; }; buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ]; <del> doCheck = !stdenv.isDarwin; </del> <ins> # https://rt.cpan.org/Public/Bug/Display.html?id=130742 # doCheck = !stdenv.isDarwin; doCheck = false; </ins> meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library";
substituteInPlace $out/lib/libsane.la  --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg" <ins> # net.conf conflicts with the file generated by the nixos module rm -f $out/etc/sane.d/net.conf </ins> '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; {
# gfortran readline bzip2 lzma pcre.dev curl ed ## WIP: fastr dependencies ]; postUnpack = '' <del> cp ${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/stdlib.h  </del> <ins> cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h  </ins> $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include cp ${truffleMake} $TMP && mv *truffle.make truffle.make rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
--replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";' # prevent cyclical imports caused by identical <include> names substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h  <del> --replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/cstdlib"' </del> <ins> --replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"' </ins> # dragonegg can't seem to compile on nix, so let's not require it substituteInPlace sulong/mx.sulong/suite.py  --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
patches = [ ./make-paths-configurable.patch ]; configurePhase = '' <del> pixiePath="${pixie}/bin/pixie-vm"  </del> <ins> pixiePath="${pixie}/bin/pixie"  </ins> basePath="$out/share/dust"  <ins> rlwrapPath="${rlwrap}/bin/rlwrap"  </ins> substituteAll dust.in dust chmod +x dust '';
index 0000000..44a7fbd --- /dev/null +++ b/dust.in <del> @@ -0,0 +1,43 @@ </del> <ins> @@ -0,0 +1,40 @@ </ins> +#!/usr/bin/env bash + +base_path=@basePath@ +pixie_path=@pixiePath@ <ins> +rlwrap_cmd=@rlwrapPath@ </ins> + +function set_load_path() { +    load_path=""
+ +case $1 in +    ""|"repl") <del> +        rlwrap_cmd="" +        if [ -n "`which rlwrap`" ]; then +            rlwrap_cmd="rlwrap -aignored -n" +        fi +        $rlwrap_cmd $pixie_path $load_path </del> <ins> +        $rlwrap_cmd -aignored -n $pixie_path $load_path </ins> +        ;; +    "run") +        shift
stdenv.mkDerivation { pname = "libvterm-neovim"; <del> version = "2019-08-28"; </del> <ins> version = "2019-10-08"; </ins> src = fetchFromGitHub { owner = "neovim"; repo = "libvterm"; <del> rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79"; sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif"; </del> <ins> rev = "7c72294d84ce20da4c27362dbd7fa4b08cfc91da"; sha256 = "111qyxq33x74dwdnqcnzlv9j0n8hxyribd6ppwcsxmyrniyw9qrk"; </ins> }; buildInputs = [ perl ];
<ins> { atomEnv , autoPatchelfHook , dpkg , fetchurl , makeDesktopItem , makeWrapper , stdenv , udev , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "termius"; version = "5.10.1"; src = fetchurl { url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s"; }; desktopItem = makeDesktopItem { categories = "Network;"; comment = "The SSH client that works on Desktop and Mobile"; desktopName = "Termius"; exec = "termius-app"; genericName = "Cross-platform SSH client"; icon = "termius-app"; name = "termius-app"; }; dontBuild = true; dontConfigure = true; dontPatchELF = true; dontWrapGApps = true; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; buildInputs = atomEnv.packages; unpackPhase = "dpkg-deb -x $src ."; installPhase = '' mkdir -p "$out/bin" cp -R "opt" "$out" cp -R "usr/share" "$out/share" chmod -R g-w "$out" # Desktop file mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; runtimeDependencies = [ udev.lib ]; postFixup = '' makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app  "''${gappsWrapperArgs[@]}" ''; meta = with stdenv.lib; { description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; license = licenses.unfree; maintainers = with maintainers; [ filalex77 ]; platforms = [ "x86_64-linux" ]; }; } </ins>
inherit (common) src; <ins> patches = [ # Fix for ghostscript>=9.27 # Backport of # https://github.com/mgieseki/dvisvgm/commit/bc51951bc90b700c28ea018993bdb058e5271e9b ./dvisvgm-fix.patch # Needed for ghostscript>=9.50 (fetchpatch { url = "https://github.com/mgieseki/dvisvgm/commit/7b93a9197b69305429183affd24fa40ee04a663a.patch"; sha256 = "1gmj76ja9xng39wxckhs9q140abixgb8rkrcfv2cdgq786wm3vag"; stripLen = 1; extraPrefix = "texk/dvisvgm/dvisvgm-src/"; }) ]; </ins> nativeBuildInputs = [ pkgconfig ]; # TODO: dvisvgm still uses vendored dependencies <del> buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype potrace xxHash ]; </del> <ins> buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ]; </ins> preConfigure = "cd texk/dvisvgm";
<ins> diff a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp --- a/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp +++ b/texk/dvisvgm/dvisvgm-src/src/psdefs.cpp @@ -107,8 +107,7 @@ const char *PSInterpreter::PSDEFS = "dmode sysexec<</Normal 0/Compatible 0/Multiply 1/Screen 2/Overlay 3/SoftLight " "4/HardLight 5/ColorDodge 6/ColorBurn 7/Darken 8/Lighten 9/Difference 10/Exclus" "ion 11/Hue 12/Saturation 13/Color 14/Luminosity 15/CompatibleOverprint 16>>exc" -"h get 1(setblendmode)prcmd}def/@pdfpagecount{GS_PDF_ProcSet begin pdfdict begi" -"n(r)file pdfopen begin pdfpagecount currentdict pdfclose end end end}def/@pdfp" -"agebox{GS_PDF_ProcSet begin pdfdict begin(r)file pdfopen begin dup dup 1 lt ex" -"ch pdfpagecount gt or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse curre" -"ntdict pdfclose end end end}def DELAYBIND{.bindnow}if "; +"h get 1(setblendmode)prcmd}def/@pdfpagecount{(r)file runpdfbegin pdfpagecount " +"runpdfend}def/@pdfpagebox{(r)file runpdfbegin dup dup 1 lt exch pdfpagecount g" +"t or{pop}{pdfgetpage/MediaBox pget pop aload pop}ifelse runpdfend}def DELAYBIN" +"D{.bindnow}if "; </ins>
<ins> { stdenv , lib , rustPlatform , fetchpatch , fetchFromGitHub , pkg-config , dbus , openssl }: rustPlatform.buildRustPackage rec { pname = "tiny"; version = "0.5.1"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa"; }; cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv"; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ]; meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; } </ins>
buildInputs = [ cmake boost openssl ]; <del> # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629 propagatedBuildInputs = [ asio ]; </del> cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; enableParallelBuilding = true; <ins> # The test driver binary lacks an RPath to the library's libs preCheck = '' export LD_LIBRARY_PATH=$PWD/libs/network/src ''; # Most tests make network GET requests to various websites doCheck = false; </ins> meta = with stdenv.lib; { <del> description = "Collection of open-source libraries for high level network programming"; </del> <ins> description = "Collection of open-source libraries for high level network programming"; </ins> homepage    = https://cpp-netlib.org; license     = licenses.boost; platforms   = platforms.all;
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; <del> cpp-netlib = callPackage ../development/libraries/cpp-netlib { openssl = openssl_1_0_2; }; </del> <ins> cpp-netlib = callPackage ../development/libraries/cpp-netlib {}; </ins> uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { };
sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; <del> preConfigure = '' </del> <ins> preConfigure = with stdenv.lib.versions; '' </ins> ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include  --boost-lib-dir=${boost}/lib  --no-use-shipped-boost  <del> --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} </del> <ins> --boost-python-libname=boost_python${major python.version}${minor python.version}  --cuda-root=${cudatoolkit} </ins> ''; postInstall = ''
<ins> { lib, fetchurl, appimageTools}: let pname = "lbry-desktop"; version = "0.50.2"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; # Fetch from GitHub Releases and extract src = appimageTools.extract { inherit name; src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; }; }; # At runtime, Lbry likes to have access to Ffmpeg extraPkgs = pkgs: with pkgs; [ ffmpeg ]; # General fixup extraInstallCommands = '' # Firstly, rename the executable to lbry for convinence mv $out/bin/${name} $out/bin/lbry # Now, install assets such as the desktop file and icons install -m 444 -D ${src}/lbry.desktop -t $out/share/applications substituteInPlace $out/share/applications/lbry.desktop  --replace 'AppRun' '$out/bin/lbry' cp -r ${src}/usr/share/icons $out/share ''; meta = with lib; { description = "A browser and wallet for LBRY, the decentralized, user-controlled content marketplace"; longDescription = '' The LBRY app is a graphical browser for the decentralized content marketplace provided by the LBRY protocol. It is essentially the lbry daemon bundled with a UI using Electron. ''; license = licenses.mit; homepage = "https://lbry.com/"; downloadPage = "https://lbry.com/get/"; changelog = "https://github.com/lbryio/lbry-desktop/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ enderger ]; platforms = [ "x86_64-linux" ]; }; } </ins>
lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; <ins> lbry = callPackage ../applications/video/lbry { }; </ins> lbzip2 = callPackage ../tools/compression/lbzip2 { }; lci = callPackage ../applications/science/logic/lci {};
{ stdenv, fetchurl, autoPatchelfHook, makeWrapper <del> , alsaLib, xorg </del> <ins> , alsaLib, xorg, libjack2 </ins> , gtk3, pango, gdk-pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: stdenv.mkDerivation rec { pname = "reaper"; <del> version = "5.987"; </del> <ins> version = "6.10"; </ins> src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; <del> sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k"; </del> <ins> sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; </ins> }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
rm $out/opt/REAPER/uninstall-reaper.sh wrapProgram $out/opt/REAPER/reaper  <del> --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib </del> <ins> --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" </ins> mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/