jiebi/CodeConvo huggingface dataset:
}; }; serviceOpts.serviceConfig.ExecStart = '' <del> ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter  --port ${toString cfg.port}  ${cfg.url} ${prettyJSON (generateConfig cfg.extraLabels)}  </del> <ins> ${pkgs.prometheus-json-exporter}/bin/json_exporter  --config.file ${prettyJSON (generateConfig cfg.extraLabels)}  --web.listen-address "${cfg.listenAddress}:${toString cfg.port}"  </ins> ${concatStringsSep " n  " cfg.extraFlags} ''; <ins> imports = [ (mkRemovedOptionModule [ "url" ] '' This option was removed. The URL of the rspamd metrics endpoint must now be provided to the exporter by prometheus via the url parameter `target'. In prometheus a scrape URL would look like this: http://some.rspamd-exporter.host:7980/probe?target=http://some.rspamd.host:11334/stat For more information, take a look at the official documentation (https://github.com/prometheus-community/json_exporter) of the json_exporter. '') ({ options.warnings = options.warnings; options.assertions = options.assertions; }) ]; </ins> }
exporterConfig = { enable = true; url = "http://localhost"; <del> configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON [{ name = "json_test_metric"; path = "$.test"; }]); </del> <ins> configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { metrics = [ { name = "json_test_metric"; path = "$.test"; } ]; }); </ins> }; metricProvider = { systemd.services.prometheus-json-exporter.after = [ "nginx.service" ];
wait_for_open_port(80) wait_for_unit("prometheus-json-exporter.service") wait_for_open_port(7979) <del> succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'") </del> <ins> succeed( "curl -sSf 'localhost:7979/probe?target=http://localhost' | grep -q 'json_test_metric 1'" ) </ins> ''; };
wait_for_open_port(11334) wait_for_open_port(7980) wait_until_succeeds( <del> "curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host="rspamd"} 0'" </del> <ins> "curl -sSf 'localhost:7980/probe?target=http://localhost:11334/stat' | grep -q 'rspamd_scanned{host="rspamd"} 0'" </ins> ) ''; };
<del> # This file was generated by go2nix. { buildGoPackage, fetchFromGitHub, fetchpatch, lib, nixosTests }: </del> <ins> { lib, buildGoModule, fetchFromGitHub, nixosTests }: </ins> <del> buildGoPackage { </del> <ins> buildGoModule rec { </ins> pname = "prometheus-json-exporter"; <del> version = "unstable-2017-10-06"; goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; </del> <ins> version = "0.2.0"; </ins> src = fetchFromGitHub { <del> owner = "kawamuray"; repo = "prometheus-json-exporter"; rev = "51e3dc02a30ab818bb73e5c98c3853231c2dbb5f"; sha256 = "1v1p4zcqnb3d3rm55r695ydn61h6gz95f55cpa22hzw18dasahdh"; </del> <ins> owner = "prometheus-community"; repo = "json_exporter"; rev = "v${version}"; sha256 = "1aabvd75a2223x5wnbyryigj7grw6l05jhr3g3s97b1f1hfigz6d"; </ins> }; <del> goDeps = ./json-exporter_deps.nix; patches = [(fetchpatch { # adds bool support url = "https://patch-diff.githubusercontent.com/raw/kawamuray/prometheus-json-exporter/pull/17.patch"; sha256 = "0mc5axhd2bykci41dgswl4r1552d70jsmb17lbih7czhsy6rgmrm"; })]; </del> <ins> vendorSha256 = "03kb0gklq08krl7qnvs7267siw1pkyy346b42dsk1d9gr5302wsw"; </ins> passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; <del> homepage = "https://github.com/kawamuray/prometheus-json-exporter"; </del> <ins> homepage = "https://github.com/prometheus-community/json_exporter"; </ins> license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; };
<del> # This file was generated by go2nix. [ { goPackagePath = "github.com/Sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/Sirupsen/logrus"; rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; }; } { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; }; } { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; }; } { goPackagePath = "github.com/kawamuray/jsonpath"; fetch = { type = "git"; url = "https://github.com/kawamuray/jsonpath"; rev = "5c448ebf973557834ef870e788b0b2d95ac68d12"; sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a"; }; } { goPackagePath = "github.com/kawamuray/prometheus-exporter-harness"; fetch = { type = "git"; url = "https://github.com/kawamuray/prometheus-exporter-harness"; rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6"; sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv"; }; } { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; url = "https://github.com/matttproud/golang_protobuf_extensions"; rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; rev = "575f371f7862609249a1be4c9145f429fe065e32"; sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps"; }; } { goPackagePath = "github.com/prometheus/client_model"; fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; }; } { goPackagePath = "github.com/prometheus/common"; fetch = { type = "git"; url = "https://github.com/prometheus/common"; rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3"; sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0"; }; } { goPackagePath = "github.com/prometheus/procfs"; fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; }; } { goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; }; } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; }; } ] </del>
# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly , drmSupport ? true <del> ## other , crashreporterSupport ? false </del> # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding.
<ins> [ "tree-sitter-agda", "tree-sitter-bash", "tree-sitter-c", "tree-sitter-c-sharp", "tree-sitter-cpp", "tree-sitter-css", "tree-sitter-elixir", "tree-sitter-elm", "tree-sitter-fluent", "tree-sitter-go", "tree-sitter-haskell", "tree-sitter-hcl", "tree-sitter-html", "tree-sitter-java", "tree-sitter-javascript", "tree-sitter-jsdoc", "tree-sitter-json", "tree-sitter-julia", "tree-sitter-nix", "tree-sitter-ocaml", "tree-sitter-php", "tree-sitter-prisma", "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", "tree-sitter-scala", "tree-sitter-swift", "tree-sitter-typescript", "tree-sitter-verilog", "tree-sitter-zig" ] </ins>
<ins> { lib , pkgs , symlinkJoin , fetchzip , melpaBuild , stdenv , fetchFromGitHub , writeText , melpaStablePackages , runCommand , tree-sitter-grammars , plugins ? map (g: tree-sitter-grammars.${g}) (lib.importJSON ./default-grammars.json) , final }: let inherit (melpaStablePackages) tree-sitter-langs; libSuffix = if stdenv.isDarwin then "dylib" else "so"; soName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname) + "." + libSuffix; grammarDir = runCommand "emacs-tree-sitter-grammars" { # Fake same version number as upstream language bundle to prevent triggering runtime downloads inherit (tree-sitter-langs) version; } ('' install -d $out/langs/bin echo -n $version > $out/langs/bin/BUNDLE-VERSION '' + lib.concatStringsSep "n" (map ( g: "ln -s ${g}/parser $out/langs/bin/${soName g}") plugins )); in melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { postPatch = old.postPatch or "" + '' substituteInPlace ./tree-sitter-langs-build.el  --replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir"  "tree-sitter-langs-grammar-dir "${grammarDir}/langs"" ''; passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; }; }) </ins>
<ins> #!/usr/bin/env nix-shell #! nix-shell ../../../../../../. -i python3 -p python3 -p nix from os.path import ( dirname, abspath, join, ) from typing import ( List, Any, ) import subprocess import json import sys import os def fmt_grammar(grammar: str) -> str: return "tree-sitter-" + grammar def eval_expr(nixpkgs: str, expr: str) -> Any: p = subprocess.run( [ "nix-instantiate", "--json", "--eval", "--expr", ("with import %s {}; %s" % (nixpkgs, expr)), ], check=True, stdout=subprocess.PIPE, ) return json.loads(p.stdout) def check_grammar_exists(nixpkgs: str, grammar: str) -> bool: return eval_expr( nixpkgs, f'lib.hasAttr "{fmt_grammar(grammar)}" tree-sitter-grammars' ) def build_attr(nixpkgs, attr: str) -> str: return ( subprocess.run( ["nix-build", "--no-out-link", nixpkgs, "-A", attr], check=True, stdout=subprocess.PIPE, ) .stdout.decode() .strip() ) if __name__ == "__main__": cwd = dirname(abspath(__file__)) nixpkgs = abspath(join(cwd, "../../../../../..")) src_dir = build_attr(nixpkgs, "emacs.pkgs.tree-sitter-langs.src") existing: List[str] = [] grammars = os.listdir(join(src_dir, "repos")) for g in grammars: exists = check_grammar_exists(nixpkgs, g) if exists: existing.append(fmt_grammar(g)) else: sys.stderr.write("Missing grammar: " + fmt_grammar(g) + "n") sys.stderr.flush() with open(join(cwd, "default-grammars.json"), mode="w") as f: json.dump(sorted(existing), f, indent=2) f.write("n") </ins>
<ins> { lib , symlinkJoin , melpaBuild , fetchFromGitHub , rustPlatform , writeText , clang , llvmPackages , runtimeShell , writeScript , python3 , nix-prefetch-github , nix }: let srcMeta = lib.importJSON ./src.json; inherit (srcMeta) version; src = fetchFromGitHub srcMeta.src; tsc = melpaBuild { inherit src; inherit version; pname = "tsc"; commit = version; sourceRoot = "source/core"; recipe = writeText "recipe" '' (tsc :repo "emacs-tree-sitter/elisp-tree-sitter" :fetcher github) ''; }; tsc-dyn = rustPlatform.buildRustPackage { inherit version; inherit src; pname = "tsc-dyn"; nativeBuildInputs = [ clang ]; sourceRoot = "source/core"; configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; postInstall = '' LIB=($out/lib/libtsc_dyn.*) TSC_PATH=$out/share/emacs/site-lisp/elpa/tsc-${version} install -d $TSC_PATH install -m444 $out/lib/libtsc_dyn.* $TSC_PATH/''${LIB/*libtsc_/tsc-} echo -n $version > $TSC_PATH/DYN-VERSION rm -r $out/lib ''; inherit (srcMeta) cargoSha256; }; in symlinkJoin { name = "tsc-${version}"; paths = [ tsc tsc-dyn ]; passthru = { updateScript = let pythonEnv = python3.withPackages(ps: [ ps.requests ]); in writeScript "tsc-update" '' #!${runtimeShell} set -euo pipefail export PATH=${lib.makeBinPath [ nix-prefetch-github nix pythonEnv ]}:$PATH exec python3 ${builtins.toString ./update.py} ${builtins.toString ./.} ''; }; meta = { description = "The core APIs of the Emacs binding for tree-sitter."; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pimeys ]; }; } </ins>
<ins> { "src": { "owner": "emacs-tree-sitter", "repo": "elisp-tree-sitter", "rev": "909717c685ff5a2327fa2ca8fb8a25216129361c", "sha256": "LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" }, "version": "0.18.0", "cargoSha256": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" } </ins>
<ins> #!/usr/bin/env python3 from textwrap import dedent from os.path import ( abspath, dirname, join, ) from typing import ( Dict, Any, ) import subprocess import tempfile import json import sys import re import requests def eval_drv(nixpkgs: str, expr: str) -> Any: expr = "n".join( ( "with (import %s {});" % nixpkgs, expr, ) ) with tempfile.NamedTemporaryFile(mode="w") as f: f.write(dedent(expr)) f.flush() p = subprocess.run( ["nix-instantiate", "--json", f.name], stdout=subprocess.PIPE, check=True ) return p.stdout.decode().strip() def get_src(tag_name: str) -> Dict[str, str]: p = subprocess.run( [ "nix-prefetch-github", "--rev", tag_name, "--json", "emacs-tree-sitter", "elisp-tree-sitter", ], stdout=subprocess.PIPE, check=True, ) src = json.loads(p.stdout) fields = ["owner", "repo", "rev", "sha256"] return {f: src[f] for f in fields} def get_cargo_sha256(drv_path: str): # Note: No check=True since we expect this command to fail p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE) stderr = p.stderr.decode() lines = iter(stderr.split("n")) for l in lines: if l.startswith("error: hash mismatch in fixed-output derivation"): break else: raise ValueError("Did not find expected hash mismatch message") for l in lines: m = re.match(r"s+got:s+(.+)$", l) if m: return m.group(1) raise ValueError("Could not extract actual sha256 hash: ", stderr) if __name__ == "__main__": cwd = sys.argv[1] nixpkgs = abspath(join(cwd, "../../../../../..")) tag_name = requests.get( "https://api.github.com/repos/emacs-tree-sitter/elisp-tree-sitter/releases/latest" ).json()["tag_name"] src = get_src(tag_name) with tempfile.NamedTemporaryFile(mode="w") as f: json.dump(src, f) f.flush() drv_path = eval_drv( nixpkgs, """ rustPlatform.buildRustPackage { pname = "tsc-dyn"; version = "%s"; nativeBuildInputs = [ clang ]; src = fetchFromGitHub (lib.importJSON %s); sourceRoot = "source/core"; cargoSha256 = lib.fakeSha256; } """ % (tag_name, f.name), ) cargo_sha256 = get_cargo_sha256(drv_path) with open(join(cwd, "src.json"), mode="w") as f: json.dump( { "src": src, "version": tag_name, "cargoSha256": cargo_sha256, }, f, indent=2, ) f.write("n") </ins>
sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; }) # Disable python tests on Darwin as they use gpg (see configureFlags below) <del> ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch; </del> <ins> ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch # Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html ++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch; </ins> outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
<ins> diff -Naur gpgme.old/configure.ac gpgme.new/configure.ac --- gpgme.old/configure.ac	2020-11-12 04:19:50.000000000 -0500 +++ gpgme.new/configure.ac	2021-01-08 03:04:38.000000000 -0500 @@ -166,6 +166,16 @@ mym4_minor mym4_micro) AC_SUBST(VERSION_NUMBER) +# Try to find a thread-safe version of ttyname(). +gnupg_REPLACE_TTYNAME_R +if test "$ac_cv_func_ttyname_r" != yes; then +  AC_MSG_WARN([ +*** +*** ttyname() is not thread-safe and ttyname_r() does not exist +***]) +fi + + # We need to compile and run a program on the build machine.  A # comment in libgpg-error says that the AC_PROG_CC_FOR_BUILD macro in # the AC archive is broken for autoconf 2.57.  Given that there is no @@ -658,15 +668,6 @@ AC_FUNC_FSEEKO -# Try to find a thread-safe version of ttyname(). -gnupg_REPLACE_TTYNAME_R -if test "$ac_cv_func_ttyname_r" != yes; then -  AC_MSG_WARN([ -*** -*** ttyname() is not thread-safe and ttyname_r() does not exist -***]) -fi - # Try to find a thread-safe version of getenv(). have_thread_safe_getenv=no jm_GLIBC21 </ins>
in stdenv.mkDerivation rec { pname = "cudatext"; <del> version = "1.118.2"; </del> <ins> version = "1.122.3"; </ins> src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; <del> sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm"; </del> <ins> sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b"; </ins> }; <del> patches = [ # Don't check for update ./dont-check-update.patch ]; </del> postPatch = '' substituteInPlace app/proc_globdata.pas  --replace "/usr/share/cudatext" "$out/share/cudatext"  <del> --replace "libpython3.so" "${python3}/lib/libpython3.so" </del> <ins> --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so"  --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;" </ins> ''; nativeBuildInputs = [ lazarus fpc ]
{ "EncConv": { "owner": "Alexey-T", <del> "rev": "2020.06.15", "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" </del> <ins> "rev": "2021.01.01", "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6" </ins> }, "ATBinHex-Lazarus": { "owner": "Alexey-T", <del> "rev": "2020.09.05", "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" </del> <ins> "rev": "2020.11.22", "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7" </ins> }, "ATFlatControls": { "owner": "Alexey-T", <del> "rev": "2020.11.02", "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy" </del> <ins> "rev": "2021.01.12", "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9" </ins> }, "ATSynEdit": { "owner": "Alexey-T", <del> "rev": "6560bc35a2cf31399be8713ac189216afabf9f01", "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x" </del> <ins> "rev": "2021.01.19", "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1" </ins> }, "ATSynEdit_Cmp": { "owner": "Alexey-T", <del> "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433", "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr" </del> <ins> "rev": "2021.01.17", "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly" </ins> }, "EControl": { "owner": "Alexey-T", <del> "rev": "2020.10.04", "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq" </del> <ins> "rev": "2021.01.12", "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq" </ins> }, "ATSynEdit_Ex": { "owner": "Alexey-T",
}, "Python-for-Lazarus": { "owner": "Alexey-T", <del> "rev": "2020.10.23", "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn" </del> <ins> "rev": "2021.01.16", "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5" </ins> }, "Emmet-Pascal": { "owner": "Alexey-T",
}, "CudaText-lexers": { "owner": "Alexey-T", <del> "rev": "2020.08.10", "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" </del> <ins> "rev": "2021.01.16", "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh" </ins> }, "bgrabitmap": { "owner": "bgrabitmap",
<del> diff --git i/app/formmain.pas w/app/formmain.pas index f6f37febb..cf993d75e 100644 --- i/app/formmain.pas +++ w/app/formmain.pas @@ -2156,6 +2156,7 @@ begin false {$endif}; *) +  mnuHelpCheckUpd.Enabled:=false; with AppPanels[cPaneSide] do begin </del>
sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; <del> patches = [ ./systemd.patch ./union-wait.patch ]; </del> <ins> patches = [ ./systemd.patch ./union-wait.patch ./fix-includes-for-musl.patch ]; </ins> NIX_CFLAGS_COMPILE = "-DSYSV";
+#include <sys/stat.h> +#include <sys/socket.h> +#include <sys/un.h> <del> +#include <sys/fcntl.h> </del> +#include <netinet/in.h> +#include <stdlib.h> <ins> +#include <fcntl.h> </ins> +#include <errno.h> +#include <unistd.h> +#include <string.h>
{ luarocks, fetchFromGitHub }: luarocks.overrideAttrs(old: { pname = "luarocks-nix"; <del> version = "2019-09-07"; </del> <ins> version = "2021-01-22"; </ins> src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; <del> rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde"; sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y"; </del> <ins> rev = "v3.5.0_nix"; sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; </ins> }; <del> patches = [ ./darwin-3.1.3.patch ]; </del> })
<del> { stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium , libarchive, darwin, coreutils }: </del> <ins> { stdenv , lib , fetchFromGitHub , autoreconfHook , DiskArbitration , pkg-config , bzip2 , libarchive , libconfuse , libsodium , lzma , zlib , coreutils , dosfstools , mtools , unzip , zip , which , xdelta }: </ins> stdenv.mkDerivation rec { pname = "fwup"; <del> version = "1.5.2"; </del> <ins> version = "1.8.3"; </ins> src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; <del> sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; </del> <ins> sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; </ins> }; <del> doCheck = true; patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; </del> <ins> patches = [ ./fix-testrunner-darwin.patch ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; </ins> <del> nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] </del> <ins> buildInputs = [ bzip2 libarchive libconfuse libsodium lzma zlib ] </ins> ++ lib.optionals stdenv.isDarwin [ <del> darwin.apple_sdk.frameworks.DiskArbitration ]; propagatedBuildInputs = [ zip unzip mtools dosfstools coreutils ]; </del> <ins> DiskArbitration ]; propagatedBuildInputs = [ coreutils dosfstools mtools unzip zip ]; checkInputs = [ which xdelta ]; doCheck = true; </ins> meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner";
qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; <del> fwup = callPackage ../tools/misc/fwup { }; </del> <ins> fwup = callPackage ../tools/misc/fwup { inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; </ins> fx_cast_bridge = callPackage ../tools/misc/fx_cast { };
github = "HannahMR"; githubId = 9088467; }; <ins> hannesgith = { email = "nix@h-h.win"; github = "hannesgith"; githubId = 33062605; name = "Hannes Hattenbach"; }; </ins> hansjoergschurr = { email = "commits@schurr.at"; github = "hansjoergschurr";
<ins> diff --git a/src/converter.js b/src/converter.js index af7b4c3..20da407 100644 --- a/src/converter.js +++ b/src/converter.js @@ -1,4 +1,4 @@ -import open from 'open'; +const open = import('open'); const os = require("os"); const path = require('path'); @@ -9,9 +9,9 @@ const rpc = require('./weh-rpc'); const exec_dir = path.dirname(process.execPath); -const ffmpeg = findExecutableFullPath("ffmpeg", exec_dir); -const ffprobe = findExecutableFullPath("ffprobe", exec_dir); -const filepicker = findExecutableFullPath("filepicker", exec_dir); +const ffmpeg = "@ffmpeg@/bin/ffmpeg"; +const ffprobe = "@ffmpeg@/bin/ffprobe"; +const filepicker = "@filepicker@"; if (!fileExistsSync(ffmpeg)) { logger.error("ffmpeg not found. Install ffmpeg and make sure it's in your path."); diff --git a/src/main.js b/src/main.js index 47b92de..e2e9402 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -const config = require('config.json'); +const config = require('./config.json'); const converter = require('./converter'); const os = require("os"); diff --git a/src/native-autoinstall.js b/src/native-autoinstall.js index 556a22b..c729568 100644 --- a/src/native-autoinstall.js +++ b/src/native-autoinstall.js @@ -1,7 +1,7 @@ const os = require("os"); const path = require("path"); const { spawn, exec } = require('child_process'); -const config = require('config.json'); +const config = require('./config.json'); let fs; if (process.versions.node.startsWith("10")) { </ins>  No newline at end of file
<ins> { lib , rustPlatform , fetchFromGitHub , pkg-config , atk , gtk3 , glib }: rustPlatform.buildRustPackage rec { pname = "filepicker"; version = "1.0.1"; src = fetchFromGitHub { owner = "paulrouget"; repo = "static-filepicker"; rev = "v${version}"; hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s="; }; cargoHash = "sha256-aal7ppFkCpNc+QTS4Qklsb9WfJ65QqG6p1eOskiX+/Q="; buildInputs = [ atk gtk3 glib ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "File picker used by VDHCoApp"; homepage = "https://github.com/paulrouget/static-filepicker"; license = licenses.gpl2; mainProgram = "filepicker"; maintainers = with maintainers; [ hannesgith ]; }; } </ins>