jiebi/CodeConvo huggingface dataset:
strictDeps = true; postPatch = '' <del> substituteInPlace stack-lang.c --replace /usr/share /run/current-system/sw/share sed -i '/{ NULL, "/usr/share" },/i { NULL, "/run/current-system/sw/share" },' theme.c </del> <ins> substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share </ins> ''; <ins> passthru.updateScript = unstableGitUpdater { }; </ins> meta = { homepage = "https://github.com/labwc/labwc-tweaks"; description = "Configuration gui app for labwc"; mainProgram = "labwc-tweaks"; <del> license = lib.licenses.gpl2Plus; </del> <ins> license = lib.licenses.gpl2Only; </ins> platforms = lib.platforms.unix; <del> maintainers = with lib.maintainers; [ romildo ]; </del> <ins> maintainers = with lib.maintainers; [ AndersonTorres romildo ]; </ins> }; })
<ins> { lib , stdenv , fetchFromGitHub , buildNpmPackage , rustPlatform , pkg-config , openssl , darwin }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; version = "0.7.1"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE="; }; cargoHash = "sha256-6lnURuE1cgNAniHl5ozXo1W3cLYYje7er+ZhvZDKdVg="; nativeBuildInputs = [ pkg-config openssl ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' rm -rf "ui/public" ln -s ${passthru.ui} "ui/public" ''; OPENSSL_NO_VENDOR = 1; passthru.ui = buildNpmPackage { name = "ui"; src = "${src}/ui"; npmDepsHash = "sha256-uMyOAYLVHhY4ytvEFvVzdoQ7ExzQ4sH+ZtDrEacu5bk="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' runHook preInstall mv public/ $out runHook postInstall ''; }; meta = with lib; { changelog = "https://github.com/cooklang/cookcli/releases/tag/v${version}"; description = "A suite of tools to create shopping lists and maintain recipes"; homepage = "https://cooklang.org/"; license = [ licenses.mit ]; mainProgram = "cook"; maintainers = [ maintainers.emilioziniades ]; platforms = platforms.linux ++ platforms.darwin; }; } </ins>
githubId = 4732885; name = "Ivan Jager"; }; <ins> aikooo7 = { name = "Diogo Fernandes"; email = "prozinhopro1973@gmail.com"; matrix = "@aikoo7:matrix.org"; github = "aikooo7"; githubId = 79667753; keys = [{ fingerprint = "B0D7 2955 235F 6AB5 ACFA  1619 8C7F F5BB 1ADE F191"; }]; }; </ins> aiotter = { email = "git@aiotter.com"; github = "aiotter";
<ins> diff --git a/sdk/program/src/account_info.rs b/sdk/program/src/account_info.rs index 372370d0e15a0f2877b02ad29586e5b352438b24..3db3e9839b6535786e60be5602c03d0c909bf937 100644 --- a/sdk/program/src/account_info.rs +++ b/sdk/program/src/account_info.rs @@ -182,6 +182,7 @@ impl<'a> AccountInfo<'a> { Ok(()) } +    #[rustversion::attr(since(1.72), allow(invalid_reference_casting))] pub fn assign(&self, new_owner: &Pubkey) { // Set the non-mut owner field unsafe { </ins>
"solana-gossip" "solana-install" "solana-keygen" <ins> "solana-ledger-tool" </ins> "solana-log-analyzer" "solana-net-shaper" <del> "solana-sys-tuner" "rbpf-cli" </del> "solana-validator" <del> "solana-ledger-tool" "cargo-build-bpf" "cargo-test-bpf" "solana-dos" "solana-install-init" "solana-stake-accounts" "solana-test-validator" "solana-tokens" "solana-watchtower" "cargo-test-sbf" "cargo-build-sbf" </del> ] ++ [ # XXX: Ensure `solana-genesis` is built LAST! # See https://github.com/solana-labs/solana/issues/5826
] }: let <del> version = "1.14.23"; sha256 = "sha256-NUkkLzLNh8P7PFh/SVtd9JM18w3egDaaK80urGw1SSs="; cargoSha256 = "sha256-7t8Quh6T2MzJWEM5Y50CgCyFfx2ZJRAdCpZyyYvJrt4="; </del> <ins> version = "1.16.27"; sha256 = "sha256-xd0FCSlpPJDVWOlt9rIlnSbjksmvlXJWHkvlZONd2dM="; </ins> inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; in rustPlatform.buildRustPackage rec { pname = "solana-cli"; <del> inherit version cargoSha256; </del> <ins> inherit version; </ins> src = fetchFromGitHub { owner = "solana-labs";
inherit sha256; }; <ins> cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws="; "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; }; }; patches = [ # Fix: https://github.com/solana-labs/solana/issues/34203 # From https://github.com/Homebrew/homebrew-core/pull/156930/files#diff-f27c55b86df31cd4935c956efee1be743eae0958e3850f3f9891d51bfea50b1cR76 ./account-info.patch ]; </ins> strictDeps = true; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; homepage = "https://solana.com"; license = licenses.asl20; <del> maintainers = with maintainers; [ netfox happysalada ]; </del> <ins> maintainers = with maintainers; [ netfox happysalada aikooo7 ]; </ins> platforms = platforms.unix; };
-e 's^addCVars^addCVars${_infixSalt}^g'  -e 's^[ -z "$crossConfig" ]^[[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" ]]^g' <del> '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) '' cat << 'EOF' >> $out for CMD in ar as nm objcopy ranlib strip strings size ld windres do # which is not part of stdenv, but compgen will do for now if PATH=$_PATH type -p ${prefix}$CMD > /dev/null then export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD}; fi done EOF sed -i $out -e 's_envHooks_crossEnvHooks_g' '' + '' </del> # NIX_ things which we don't both use and define, we revert them #asymmetric=$( #  for pre in "" "$"
wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi <del> export real_cc=${prefix}cc export real_cxx=${prefix}c++ </del> <ins> # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler # version. export named_cc=${prefix}cc export named_cxx=${prefix}c++ </ins> export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" if [ -e $ccPath/${prefix}gcc ]; then wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc ln -s ${prefix}gcc $out/bin/${prefix}cc <del> export real_cc=${prefix}gcc export real_cxx=${prefix}g++ </del> <ins> export named_cc=${prefix}gcc export named_cxx=${prefix}g++ </ins> elif [ -e $ccPath/clang ]; then wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang ln -s ${prefix}clang $out/bin/${prefix}cc <del> export real_cc=clang export real_cxx=clang++ </del> <ins> export named_cc=${prefix}clang export named_cxx=${prefix}clang++ </ins> fi if [ -e $ccPath/${prefix}g++ ]; then
fi if [ -z "$crossConfig" ]; then <del> export CC=@real_cc@ export CXX=@real_cxx@ </del> <ins> ENV_PREFIX="" </ins> else <del> export BUILD_CC=@real_cc@ export BUILD_CXX=@real_cxx@ </del> <ins> ENV_PREFIX="BUILD_" </ins> fi <ins> export NIX_${ENV_PREFIX}CC=@out@ export ${ENV_PREFIX}CC=@named_cc@ export ${ENV_PREFIX}CXX=@named_cxx@ for CMD in  cpp  ar as nm objcopy ranlib strip strings size ld windres do if PATH=$_PATH type -p "@binPrefix@$CMD" > /dev/null then export "${ENV_PREFIX}${CMD^^}=@binPrefix@${CMD}"; fi done # No local scope available for sourced files unset ENV_PREFIX </ins>
<ins> { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: rustPlatform.buildRustPackage { name = "uutils-coreutils-2018-02-09"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a"; sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf"; }; # too many impure/platform-dependent tests doCheck = false; cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5"; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ cargo sphinx ]; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; installPhase = ""; meta = with stdenv.lib; { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = https://github.com/uutils/coreutils; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; platforms = platforms.unix; }; } </ins>
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; <ins> # TODO already fixed in master, remove in next release patches = [ (fetchpatch { url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch"; hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ="; includes = [ "src/utils/math.h" ]; }) ]; </ins> meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine";
<del> { lib , stdenv , callPackage , fetchFromGitHub , testers , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , cmake , curl , gdal , hdf5-cpp , LASzip , libe57format , libgeotiff , libtiff , libxml2 , openscenegraph , pkg-config , postgresql , tiledb , xercesc , zlib , zstd }: stdenv.mkDerivation (finalAttrs: { pname = "pdal"; version = "2.5.6"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl gdal hdf5-cpp LASzip libgeotiff libtiff libxml2 openscenegraph postgresql tiledb xercesc zlib zstd ] ++ lib.optionals enableE57 [ libe57format ]; cmakeFlags = [ "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" "-DBUILD_PLUGIN_HDF=ON" "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" "-DWITH_TESTS=ON" "-DBUILD_PGPOINTCLOUD_TESTS=OFF" # Plugins can probably not be made work easily: "-DBUILD_PLUGIN_CPD=OFF" "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs "-DBUILD_PLUGIN_GEOWAVE=OFF" "-DBUILD_PLUGIN_I3S=OFF" "-DBUILD_PLUGIN_ICEBRIDGE=OFF" "-DBUILD_PLUGIN_MATLAB=OFF" "-DBUILD_PLUGIN_MBIO=OFF" "-DBUILD_PLUGIN_MRSID=OFF" "-DBUILD_PLUGIN_NITF=OFF" "-DBUILD_PLUGIN_OCI=OFF" "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs "-DBUILD_PLUGIN_RIVLIB=OFF" ]; doCheck = true; disabledTests = [ # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 "pdal_io_tiledb_writer_test" "pdal_io_tiledb_reader_test" "pdal_io_tiledb_time_writer_test" "pdal_io_tiledb_time_reader_test" "pdal_io_tiledb_bit_fields_test" "pdal_io_e57_read_test" "pdal_io_e57_write_test" "pdal_io_stac_reader_test" # Segfault "pdal_io_hdf_reader_test" # Failure "pdal_app_plugin_test" ]; checkPhase = '' runHook preCheck # tests are flaky and they seem to fail less often when they don't run in # parallel ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' runHook postCheck ''; passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; command = "pdal --version"; version = "pdal ${finalAttrs.finalPackage.version}"; }; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; maintainers = teams.geospatial.members; platforms = platforms.all; pkgConfigModules = [ "pdal" ]; }; }) </del>
}) ]; <ins> # PDAL is disabled until https://github.com/qgis/QGIS/pull/54940 # is backported. </ins> cmakeFlags = [ "-DWITH_3D=True" <del> "-DWITH_PDAL=TRUE" </del> <ins> "-DWITH_PDAL=False"  # TODO: re-enable PDAL </ins> "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let
{ config, lib, pkgs, ... }: <del> with lib; </del> let cfg = config.services.locate; <del> isMLocate = hasPrefix "mlocate" cfg.package.name; isPLocate = hasPrefix "plocate" cfg.package.name; </del> <ins> isMLocate = lib.hasPrefix "mlocate" cfg.package.name; isPLocate = lib.hasPrefix "plocate" cfg.package.name; </ins> isMorPLocate = isMLocate || isPLocate; <del> isFindutils = hasPrefix "findutils" cfg.package.name; </del> <ins> isFindutils = lib.hasPrefix "findutils" cfg.package.name; </ins> in { imports = [ <del> (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) (mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ]) (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths") </del> <ins> (lib.mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) (lib.mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ]) (lib.mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths") </ins> ]; <del> options.services.locate = with types; { enable = mkOption { type = bool; </del> <ins> options.services.locate = { enable = lib.mkOption { type = lib.types.bool; </ins> default = false; description = '' If enabled, NixOS will periodically update the database of
''; }; <del> package = mkPackageOption pkgs [ "findutils" "locate" ] { </del> <ins> package = lib.mkPackageOption pkgs [ "findutils" "locate" ] { </ins> example = "mlocate"; }; <del> interval = mkOption { type = str; </del> <ins> interval = lib.mkOption { type = lib.types.str; </ins> default = "02:15"; example = "hourly"; description = ''
''; }; <del> extraFlags = mkOption { type = listOf str; </del> <ins> extraFlags = lib.mkOption { type = lib.types.listOf lib.types.str; </ins> default = [ ]; description = '' Extra flags to pass to {command}`updatedb`. ''; }; <del> output = mkOption { type = path; </del> <ins> output = lib.mkOption { type = lib.types.path; </ins> default = "/var/cache/locatedb"; description = '' The database file to build. ''; }; <del> localuser = mkOption { type = nullOr str; </del> <ins> localuser = lib.mkOption { type = lib.types.nullOr lib.types.str; </ins> default = "nobody"; description = '' The user to search non-network directories as, using
''; }; <del> pruneNames = mkOption { type = listOf str; </del> <ins> pruneNames = lib.mkOption { type = lib.types.listOf lib.types.str; </ins> default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; <del> defaultText = literalMD '' </del> <ins> defaultText = lib.literalMD '' </ins> `[ ".bzr" ".cache" ".git" ".hg" ".svn" ]`, if supported by the locate implementation (i.e. mlocate or plocate). '';
}; <del> config = mkIf cfg.enable { users.groups = mkMerge [ (mkIf isMLocate { mlocate = { }; }) (mkIf isPLocate { plocate = { }; }) </del> <ins> config = lib.mkIf cfg.enable { users.groups = lib.mkMerge [ (lib.mkIf isMLocate { mlocate = { }; }) (lib.mkIf isPLocate { plocate = { }; }) </ins> ]; security.wrappers =
setgid = true; setuid = false; }; <del> mlocate = mkIf isMLocate { </del> <ins> mlocate = lib.mkIf isMLocate { </ins> group = "mlocate"; source = "${cfg.package}/bin/locate"; }; <del> plocate = mkIf isPLocate { </del> <ins> plocate = lib.mkIf isPLocate { </ins> group = "plocate"; source = "${cfg.package}/bin/plocate"; }; in <del> mkIf isMorPLocate { locate = mkMerge [ common mlocate plocate ]; plocate = mkIf isPLocate (mkMerge [ common plocate ]); </del> <ins> lib.mkIf isMorPLocate { locate = lib.mkMerge [ common mlocate plocate ]; plocate = lib.mkIf isPLocate (lib.mkMerge [ common plocate ]); </ins> }; <del> environment.systemPackages = [ cfg.package ]; </del> <ins> environment = { # write /etc/updatedb.conf for manual calls to `updatedb` etc."updatedb.conf".text = '' PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}" PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}" PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}" PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}" ''; </ins> <del> environment.variables.LOCATE_PATH = cfg.output; </del> <ins> systemPackages = [ cfg.package ]; </ins> <del> environment.etc = { # write /etc/updatedb.conf for manual calls to `updatedb` "updatedb.conf" = { text = '' PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}" PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}" PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}" PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}" ''; </del> <ins> variables = lib.mkIf isFindutils { LOCATE_PATH = cfg.output; </ins> }; }; <del> warnings = optional (isMorPLocate && cfg.localuser != null) </del> <ins> warnings = lib.optional (isMorPLocate && cfg.localuser != null) </ins> "mlocate and plocate do not support the services.locate.localuser option. updatedb will run as root. Silence this warning by setting services.locate.localuser = null." <del> ++ optional (isFindutils && cfg.pruneNames != [ ]) </del> <ins> ++ lib.optional (isFindutils && cfg.pruneNames != [ ]) </ins> "findutils locate does not support pruning by directory component" <del> ++ optional (isFindutils && cfg.pruneBindMounts) </del> <ins> ++ lib.optional (isFindutils && cfg.pruneBindMounts) </ins> "findutils locate does not support skipping bind mounts"; systemd.services.update-locatedb = { description = "Update Locate Database"; <del> path = mkIf (!isMorPLocate) [ pkgs.su ]; </del> <ins> path = lib.mkIf (!isMorPLocate) [ pkgs.su ]; </ins> # mlocate's updatedb takes flags via a configuration file or # on the command line, but not by environment variable.
<del> { lib , stdenv , fetchurl , fetchPypi , python3 , makeWrapper , libtorrent-rasterbar-1_2_x , qt5 }: let libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation rec { pname = "tribler"; version = "7.13.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4="; }; nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper # we had a "copy" of this in tribler's makeWrapper # but it went out of date and broke, so please just use it directly qt5.wrapQtAppsHook ]; buildInputs = [ python3.pkgs.python ]; pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ # requirements-core.txt aiohttp aiohttp-apispec anyio chardet configobj cryptography decorator faker libnacl lz4 marshmallow netifaces networkx pony psutil pyasn1 pydantic_1 pyopenssl pyyaml sentry-sdk service-identity yappi yarl bitarray (pyipv8.overrideAttrs (p: rec { version = "2.10.0"; src = fetchPypi { inherit (p) pname; inherit version; hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; }; })) libtorrent file-read-backwards brotli human-readable # requirements.txt pillow pyqt5 #pyqt5-sip pyqtgraph pyqtwebengine ]); installPhase = '' mkdir -pv $out # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler  --set _TRIBLERPATH "$out/src"  --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH  --set NO_AT_BRIDGE 1  --chdir "$out/src"  --add-flags "-O $out/src/run_tribler.py" mkdir -p $out/share/applications $out/share/icons cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm mkdir -p $out/share/copyright/tribler mv $out/LICENSE $out/share/copyright/tribler ''; shellHook = '' wrapPythonPrograms || true export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" ''; meta = with lib; { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; mainProgram = "tribler"; homepage = "https://www.tribler.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ xvapx viric mkg20001 ]; platforms = platforms.linux; }; } </del>
<ins> { lib, stdenv, fetchurl, fetchPypi, python3, makeWrapper, libtorrent-rasterbar-1_2_x, qt5, nix-update-script, }: let libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation (finalAttrs: { pname = "tribler"; version = "7.14.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz"; hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4="; }; nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper # we had a "copy" of this in tribler's makeWrapper # but it went out of date and broke, so please just use it directly qt5.wrapQtAppsHook ]; buildInputs = [ python3.pkgs.python ]; pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ # requirements-core.txt aiohttp aiohttp-apispec anyio chardet configobj cryptography decorator faker libnacl lz4 marshmallow netifaces networkx pony psutil pyasn1 pydantic_1 pyopenssl pyyaml sentry-sdk service-identity yappi yarl bitarray filelock (pyipv8.overrideAttrs (p: rec { version = "2.10.0"; src = fetchPypi { inherit (p) pname; inherit version; hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; }; })) file-read-backwards brotli human-readable # requirements.txt pillow pyqt5 #pyqt5-sip pyqtgraph pyqtwebengine ]); installPhase = '' mkdir -pv $out # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler  --set _TRIBLERPATH "$out/src"  --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH  --set NO_AT_BRIDGE 1  --chdir "$out/src"  --add-flags "-O $out/src/run_tribler.py" mkdir -p $out/share/applications $out/share/icons cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm mkdir -p $out/share/copyright/tribler mv $out/LICENSE $out/share/copyright/tribler ''; shellHook = '' wrapPythonPrograms || true export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" ''; passthru.updateScript = nix-update-script { }; meta = { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; mainProgram = "tribler"; homepage = "https://www.tribler.org/"; changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ xvapx viric mkg20001 ]; platforms = lib.platforms.linux; }; }) </ins>
<ins> diff --git a/build.gradle b/build.gradle index c206e2f..b1fda33 100644 --- a/build.gradle +++ b/build.gradle @@ -69,19 +69,7 @@ launch4j { messagesInstanceAlreadyExists="Stirling-PDF is already running." } -spotless { -    java { -        target project.fileTree('src/main/java') -        googleJavaFormat('1.19.1').aosp().reorderImports(false) - -        importOrder('java', 'javax', 'org', 'com', 'net', 'io') -        toggleOffOn() -        trimTrailingWhitespace() -        indentWithSpaces() -        endWithNewline() -    } -} dependencies { //security updates @@ -163,9 +151,6 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.28' } -tasks.withType(JavaCompile) { -    dependsOn 'spotlessApply' -} compileJava { options.compilerArgs << '-parameters' } </ins>
<ins> diff --git a/build.gradle b/build.gradle index 7025b2b..d063da3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,11 @@ repositories { } +tasks.withType(AbstractArchiveTask) { +    preserveFileTimestamps = false +    reproducibleFileOrder = true +} + licenseReport { renderers = [new JsonReportRenderer()] </ins>