jiebi/CodeConvo huggingface dataset:
<ins> { lib , fetchFromGitHub , buildNpmPackage , nodejs , ffmpeg , callPackage , substituteAll , makeWrapper , toml2json , jq }: buildNpmPackage rec { pname = "vdhcoapp"; version = "2.0.19"; src = fetchFromGitHub { owner = "aclap-dev"; repo = "vdhcoapp"; rev = "v${version}"; hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU="; }; sourceRoot = "${src.name}/app"; npmDepsHash = "sha256-E032U2XZdyTER6ROkBosOTn7bweDXHl8voC3BQEz8Wg="; dontNpmBuild = true; nativeBuildInputs = [ makeWrapper toml2json jq ]; patches = [ (substituteAll { src = ./ffmpeg-filepicker.patch; inherit ffmpeg; filepicker = lib.getExe (callPackage ./filepicker.nix {}); }) ]; postPatch = '' # Cannot use patch, setting placeholder here substituteInPlace src/native-autoinstall.js  --replace process.execPath ""${placeholder "out"}/bin/vdhcoapp"" ''; preBuild = '' toml2json --pretty ../config.toml > src/config.json ''; installPhase = '' runHook preInstall mkdir -p $out/opt/vdhcoapp cp -r . "$out/opt/vdhcoapp" makeWrapper ${nodejs}/bin/node $out/bin/vdhcoapp  --add-flags $out/opt/vdhcoapp/src/main.js generateManifest() { type=$1 outputFolder=$2 mkdir -p $outputFolder manifestName=$(jq -r '.meta.id' src/config.json).json jq '.store.'$type'.manifest * (.meta | with_entries(select (.key == "description")) * {"name": .id}) * {"path" : "${placeholder "out"}/bin/vdhcoapp"}' src/config.json > $outputFolder/$manifestName } generateManifest google $out/etc/opt/chrome/native-messaging-hosts generateManifest google $out/etc/chromium/native-messaging-hosts generateManifest mozilla $out/lib/mozilla/native-messaging-hosts generateManifest google $out/etc/opt/edge/native-messaging-hosts runHook postInstall ''; meta = with lib; { description = "Companion application for the Video DownloadHelper browser add-on"; homepage = "https://www.downloadhelper.net/"; license = licenses.gpl2; platforms = lib.platforms.linux; maintainers = with maintainers; [ hannesgith ]; mainProgram = "vdhcoapp"; }; } </ins>
, isPy3k , lxml , pillow <ins> , psutil </ins> , pybind11 <del> , pytestCheckHook </del> <ins> , pytest-cov </ins> , pytest-helpers-namespace , pytest-timeout <del> , pytest_xdist , pytestrunner </del> <ins> , pytest-xdist , pytestCheckHook </ins> , python-dateutil , python-xmp-toolkit <del> , python3 </del> , qpdf <ins> , setuptools-scm </ins> , setuptools-scm-git-archive <del> , setuptools_scm , lib </del> }: buildPythonPackage rec { pname = "pikepdf"; <del> version = "2.2.0"; </del> <ins> version = "2.5.2"; </ins> disabled = ! isPy3k; src = fetchPypi { inherit pname version; <del> sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; </del> <ins> sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; </ins> }; buildInputs = [
nativeBuildInputs = [ setuptools-scm-git-archive <del> setuptools_scm </del> <ins> setuptools-scm </ins> ]; checkInputs = [ attrs hypothesis <del> pillow pytestCheckHook </del> pytest-helpers-namespace pytest-timeout <del> pytest_xdist pytestrunner </del> <ins> pytest-xdist psutil pytest-cov pytestCheckHook </ins> python-dateutil python-xmp-toolkit ]; <del> propagatedBuildInputs = [ defusedxml lxml ]; postPatch = '' sed -i  -e 's/^pytest .*/pytest/g'  -e 's/^attrs .*/attrs/g'  -e 's/^hypothesis .*/hypothesis/g'  requirements/test.txt ''; </del> <ins> propagatedBuildInputs = [ defusedxml lxml pillow ]; </ins> preBuild = '' HOME=$TMPDIR ''; <ins> pythonImportsCheck = [ "pikepdf" ]; </ins> meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf";
mkdir -p $out/${gimp.targetScriptDir}/${name}; for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } <del> installPlugins(){ mkdir -p $out/${gimp.targetPluginDir}/${name}; for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done </del> <ins> installPlugin() { # The base name of the first argument is the plug-in name and the main executable. # GIMP only allows a single plug-in per directory: # https://gitlab.gnome.org/GNOME/gimp/-/commit/efae55a73e98389e38fa0e59ebebcda0abe3ee96 pluginDir=$out/${gimp.targetPluginDir}/$(basename "$1") install -Dt "$pluginDir" "$@" </ins> } '';
Filters/Generic/FFT Forward Filters/Generic/FFT Inverse */ <del> name = "fourier-0.4.3"; buildInputs = with pkgs; [ fftw ]; </del> <ins> pname = "fourier"; version = "0.4.3"; </ins> src = fetchurl { <del> url = "https://www.lprp.fr/files/old-web/soft/gimp/${name}.tar.gz"; </del> <ins> url = "https://www.lprp.fr/files/old-web/soft/gimp/${pname}-${version}.tar.gz"; </ins> sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn"; }; <del> installPhase = "installPlugins fourier"; </del> <ins> buildInputs = with pkgs; [ fftw ]; postPatch = '' # The tarball contains a prebuilt binary. make clean ''; installPhase = '' runHook preInstall installPlugin fourier runHook postInstall ''; </ins> meta = with lib; { description = "GIMP plug-in to do the fourier transform";
rev = "de4367f71e40fe6d82387eaee68611a80a87e0e1"; sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; <del> installPhase = "installPlugins src/texturize"; </del> <ins> installPhase = "installPlugin src/texturize"; </ins> meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 };
url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; <del> installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? </del> <ins> installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? </ins> }; lqrPlugin = pluginDerivation rec {
<del> { lib, stdenv, fetchFromGitHub } : </del> <ins> { lib , stdenv , fetchFromGitHub }: </ins> stdenv.mkDerivation rec { pname = "proxychains"; <del> version = "4.2.0"; </del> <ins> version = "4.4.0"; </ins> src = fetchFromGitHub { owner = "haad"; <del> repo = "proxychains"; </del> <ins> repo = pname; </ins> rev = "${pname}-${version}"; <del> sha256 = "015skh3z1jmm8kxbm3nkqv1w56kcvabdmcbmpwzywxr4xnh3x3pc"; </del> <ins> sha256 = "083xdg6fsn8c2ns93lvy794rixxq8va6jdf99w1z0xi4j7f1nyjw"; </ins> }; postPatch = '' <del> # Temporary work-around; most likely fixed by next upstream release sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' </del> <ins> # Suppress compiler warning. Remove it when upstream fix arrives substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation" </ins> ''; postInstall = '' cp src/proxychains.conf $out/etc ''; <del> meta = { </del> <ins> meta = with lib; { </ins> description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; <del> license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; </del> <ins> license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; </ins> }; }
"~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = '' return 404; ''; <del> "~ ^/(?:.|autotest|occ|issue|indie|db_|console)".extraConfig = '' </del> <ins> "~ ^/(?:.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = '' </ins> return 404; ''; "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|.+/richdocumentscode/proxy).php(?:$|/)" = {
version = "2.1.22"; sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"; generation = "2_1"; <ins> extraMeta.knownVulnerabilities = [ # Fixed in 3.* but 2.* hasn't been released since "CVE-2020-17516" ]; </ins> })
version = "2.2.14"; sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; generation = "2_2"; <ins> extraMeta.knownVulnerabilities = [ # Fixed in 3.* but 2.* hasn't been released since "CVE-2020-17516" ]; </ins> })
{ callPackage, ... } @ args: callPackage ./generic.nix (args // { <del> version = "3.0.23"; sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; </del> <ins> version = "3.0.24"; sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; </ins> generation = "3_0"; })
{ callPackage, ... } @ args: callPackage ./generic.nix (args // { <del> version = "3.11.9"; sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c"; </del> <ins> version = "3.11.10"; sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; </ins> generation = "3_11"; })
githubId = 2789926; name = "Imran Hossain"; }; <ins> iagoq = { email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; keys = [{ longkeyid = "rsa4096/0x35D39F9A9A1BC8DA"; fingerprint = "DF90 9D58 BEE4 E73A 1B8C  5AF3 35D3 9F9A 9A1B C8DA"; }]; }; </ins> iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; github = "iammrinal0";
<ins> { fetchurl, fetchzip }: { "x86_64-darwin" = fetchzip { sha256 = "sha256-ec1l4KxKJH4Iwg9hW+xlxLADGLN1vParYaWIw7nCfKA="; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_darwin_amd64.zip"; }; "i686-linux" = fetchurl { sha256 = "sha256-9aGyC76WyzwHlAkR72kuNcd/68XdWWC3gfT92IuW2LY="; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_386.tar.gz"; }; "x86_64-linux" = fetchurl { sha256 = "sha256-qJMymTxmoPlIhuJD6zFBWWwzz+CFx+9+MOrRiFtA4IY="; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_amd64.tar.gz"; }; "aarch64-linux" = fetchurl { sha256 = "sha256-Z5hekNxeemqWsMu7n3UTmYCzdKp5Xsp9ku0G2LOqC80="; url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_arm64.tar.gz"; }; } </ins>
<del> { lib, stdenv, fetchurl }: </del> <ins> { lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }: </ins> stdenv.mkDerivation rec { pname = "adguardhome"; version = "0.106.3"; <del> src = fetchurl { url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; sha256 = "11p081dqilga61zfziw5w37k6v2r84qynhz2hr4gk8367jck54x8"; }; </del> <ins> src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system}; </ins> installPhase = '' install -m755 -D ./AdGuardHome $out/bin/adguardhome ''; <ins> passthru = { updateScript = ./update.sh; }; </ins> meta = with lib; { homepage = "https://github.com/AdguardTeam/AdGuardHome"; description = "Network-wide ads & trackers blocking DNS server"; <del> platforms = platforms.linux; maintainers = with maintainers; [ numkem ]; license = licenses.gpl3; </del> <ins> platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ numkem iagoq ]; license = licenses.gpl3Only; </ins> }; }
<ins> #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl gnugrep nix-prefetch jq # This file is based on /pkgs/servers/gotify/update.sh set -euo pipefail dirname="$(dirname "$0")" bins="$dirname/bins.nix" latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest) version=$(jq -r '.tag_name' <<<"$latest_release") echo "got version $version" declare -A systems systems[linux_386]=i686-linux systems[linux_amd64]=x86_64-linux systems[linux_arm64]=aarch64-linux systems[darwin_amd64]=x86_64-darwin echo '{ fetchurl, fetchzip }:' > "$bins" echo '{'        >> "$bins" for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do url="$(jq -r '.browser_download_url' <<< "$asset")" adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" if [ -n "$adg_system" ]; then fetch="$(grep '.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" nix_system=${systems[$adg_system]} nix_src="$(nix-prefetch -s --output nix $fetch --url $url)" echo ""$nix_system" = $fetch $nix_src;" >> $bins fi done echo '}' >> "$bins" sed -i -r -e "s/versions*?=s*?.*?;/version = "${version#v}";/" "$dirname/default.nix" </ins>
buildInputs = lib.optionals stdenv.isLinux [ zlib ]; installPhase = '' <ins> runHook preInstall </ins> mkdir -p $out/share/sbt $out/bin cp -ra . $out/share/sbt ln -sT ../share/sbt/bin/sbt $out/bin/sbt ln -sT ../share/sbt/bin/sbtn-x86_64-${ if (stdenv.isDarwin) then "apple-darwin" else "pc-linux" } $out/bin/sbtn <del> ''; doInstallCheck = true; installCheckPhase = '' ($out/bin/sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${version}  (this may take some time)' </del> <ins> runHook postInstall </ins> ''; meta = with lib; {
- `firefox-devedition`, `firefox-beta`, `firefox-esr` executable file names for now match their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. <ins> - `chromium` and `ungoogled-chromium` had a long stanging issue regarding Widevine DRM handling in nixpkgs fixed. `chromium` now no longer automatically downloads Widevine when encountering DRM protected content. To be able to play DRM protected content in `chromium` now, you have to explicitly opt-in as originally intended using `chromium.override { enableWideVine = true; }`. This override has been added almost 10 years ago. </ins> - switch-to-configuration does not directly call systemd-tmpfiles anymore. Instead, the new artificial sysinit-reactivation.target is introduced which allows to restart multiple services that are ordered before sysinit.target
./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch <del> # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch </del> <ins> ] ++ lib.optionals (packageName == "chromium") [ # This patch is limited to chromium and ungoogled-chromium because electron-source sets # enable_widevine to false. # # The patch disables the automatic Widevine download (component) that happens at runtime # completely (~/.config/chromium/WidevineCdm/). This would happen if chromium encounters DRM # protected content or when manually opening chrome://components. # # It also prevents previously downloaded Widevine blobs in that location from being loaded and # used at all, while still allowing the use of our -wv wrapper. This is because those old # versions are out of out our control and may be vulnerable, given we literally disable their # auto updater. # # bundle_widevine_cdm is available as gn flag, but we cannot use it, as it expects a bunch of # files Widevine files at configure/compile phase that we don't have. Changing the value of the # BUNDLE_WIDEVINE_CDM build flag does work in the way we want though. # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn # flag (declare_args) so we simply hardcode it to false. ./patches/widevine-disable-auto-download-allow-bundle.patch ] ++ [ </ins> # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
# Feature overrides: # Native Client support was deprecated in 2020 and support will end in June 2021: enable_nacl = false; <del> # Enabling the Widevine component here doesn't affect whether we can # redistribute the chromium package; the Widevine component is either # added later in the wrapped -wv build or downloaded from Google: </del> <ins> } // lib.optionalAttrs (packageName == "chromium") { # Enabling the Widevine here doesn't affect whether we can redistribute the chromium package. # Widevine in this drv is a bit more complex than just that. See Widevine patch somewhere above. </ins> enable_widevine = true; <ins> } // { </ins> # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
<del> diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn index ed0e2f5208b..5b431a030d5 100644 --- a/third_party/widevine/cdm/BUILD.gn +++ b/third_party/widevine/cdm/BUILD.gn @@ -14,7 +14,7 @@ buildflag_header("buildflags") { flags = [ "ENABLE_WIDEVINE=$enable_widevine", -    "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", +    "BUNDLE_WIDEVINE_CDM=true", "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", ] } </del>
<ins> diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn index 525693b6c10ab..245491e137d39 100644 --- a/third_party/widevine/cdm/BUILD.gn +++ b/third_party/widevine/cdm/BUILD.gn @@ -22,7 +22,7 @@ buildflag_header("buildflags") { flags = [ "ENABLE_WIDEVINE=$enable_widevine", -    "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", +    "BUNDLE_WIDEVINE_CDM=true", "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm", ] diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni index 58f073ca562ca..4b242c2618dfb 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni @@ -41,8 +41,7 @@ enable_library_widevine_cdm = # Widevine CDM can be deployed as a component. Currently only supported on # desktop platforms. The CDM can be bundled regardless whether # it's a component. See below. -enable_widevine_cdm_component = -    enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos) +enable_widevine_cdm_component = false # Enable (Windows) Media Foundation Widevine CDM component. declare_args() { </ins>
''; postFixup = '' <del> makeWrapper ${electron}/bin/electron $out/bin/${pname}  </del> <ins> makeWrapper ${electron_11}/bin/electron $out/bin/${pname}  </ins> --add-flags $out/share/${pname}/resources/app.asar  --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" '';
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }: buildPythonPackage { <del> name = "keepnote-0.6.5"; </del> <ins> name = "keepnote-0.7.8"; </ins> namePrefix = ""; src = fetchurl { <del> url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz; sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw"; </del> <ins> url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; </ins> }; propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];
<ins> { lib , stdenv , fetchFromGitLab , autoreconfHook , pkg-config , utilmacros , libX11 , libXaw , libXmu , libXt }: stdenv.mkDerivation rec { pname = "xedit"; version = "1.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xorg/app"; repo = "xedit"; rev = "${pname}-${version}"; sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3"; }; nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ]; buildInputs = [ libX11 libXaw libXmu libXt ]; configureFlags = [ "--with-lispdir=$out/share/X11/xedit/lisp" "--with-appdefaultdir=$out/share/X11/app-defaults" ]; meta = with lib; { description = "Simple graphical text editor using Athena Widgets (Xaw)"; homepage = "https://gitlab.freedesktop.org/xorg/app/xedit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; }; } </ins>
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; <del> buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] </del> <ins> buildInputs = [ ncurses glib ] # All X related dependencies ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [ libSM libICE libX11 libXext libXpm libXt libXaw libXau libXmu ] </ins> ++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11 ++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
<ins> { fetchFromGitHub, lib, xmrig }: xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; version = "6.14.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM="; }; meta = with lib; { description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ j0hax ]; }; }) </ins>
inherit (lib) mkOption types; <del> # Once https://github.com/NixOS/nixpkgs/pull/75584 is merged we can use the TOML generator toTOML = name: value: pkgs.runCommandNoCC name { nativeBuildInputs = [ pkgs.remarshal ]; value = builtins.toJSON value; passAsFile = [ "value" ]; } '' json2toml "$valuePath" "$out" ''; </del> <ins> toml = pkgs.formats.toml { }; </ins> in { meta = {
description = "Enable the OCI seccomp BPF hook"; }; <del> containersConf = mkOption { default = {}; </del> <ins> containersConf.settings = mkOption { type = toml.type; default = { }; </ins> description = "containers.conf configuration"; <del> type = types.submodule { options = { extraConfig = mkOption { type = types.lines; default = ""; description = '' Extra configuration that should be put in the containers.conf configuration file ''; }; }; }; </del> }; registries = {
}; config = lib.mkIf cfg.enable { <ins> virtualisation.containers.containersConf.settings = { network.cni_plugin_dirs = [ "${pkgs.cni-plugins}/bin/" ]; engine = { init_path = "${pkgs.catatonit}/bin/catatonit"; } // lib.optionalAttrs cfg.ociSeccompBpfHook.enable { hooks_dir = [ config.boot.kernelPackages.oci-seccomp-bpf-hook ]; }; }; </ins> <del> environment.etc."containers/containers.conf".text = '' [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] [engine] init_path = "${pkgs.catatonit}/bin/catatonit" ${lib.optionalString (cfg.ociSeccompBpfHook.enable) '' hooks_dir = [ "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", ] ''} '' + cfg.containersConf.extraConfig; </del> <ins> environment.etc."containers/containers.conf".source = toml.generate "containers.conf" cfg.containersConf.settings; </ins> <del> environment.etc."containers/registries.conf".source = toTOML "registries.conf" { </del> <ins> environment.etc."containers/registries.conf".source = toml.generate "registries.conf" { </ins> registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; };
virtualisation.containers = { enable = true; # Enable common /etc/containers configuration <del> containersConf.extraConfig = lib.optionalString cfg.enableNvidia (builtins.readFile (toml.generate "podman.nvidia.containers.conf" { engine = { conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; }; })); </del> <ins> containersConf.settings = lib.optionalAttrs cfg.enableNvidia { engine = { conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; }; }; </ins> }; systemd.packages = [ cfg.package ];
python3Packages.buildPythonApplication rec { pname = "electron-cash"; <del> version = "4.2.0"; </del> <ins> version = "4.2.4"; </ins> src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; <del> sha256 = "0ixsx4224jilc5zis6wbsbxqxv10mm5sksrzq15xp30zz0bzb6md"; </del> <ins> sha256 = "sha256-hiOS0cTaPqllb31p+6nU4GYvw/E1Hdn8yd3sppzGkqg="; </ins> }; propagatedBuildInputs = with python3Packages; [ <del> dnspython </del> <ins> # requirements pyaes </ins> ecdsa <ins> requests qrcode protobuf </ins> jsonrpclib-pelix <del> matplotlib pbkdf2 pyaes pycrypto pyqt5 </del> pysocks <del> qrcode requests tlslite-ng </del> qdarkstyle <ins> python-dateutil </ins> stem <ins> certifi pathvalidate dnspython </ins> <del> # plugins keepkey </del> <ins> # requirements-binaries pyqt5 psutil pycryptodomex cryptography # requirements-hw cython </ins> trezor <ins> keepkey </ins> btchip <ins> hidapi pyscard pysatochip </ins> ]; nativeBuildInputs = [ wrapQtAppsHook ];