diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/aliyun-cli/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/textplots/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/llm/open-interpreter/default.nix | 52 | ||||
-rw-r--r-- | pkgs/tools/misc/flexoptix-app/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/near-cli/default.nix | 49 | ||||
-rw-r--r-- | pkgs/tools/misc/near-cli/package.json | 83 | ||||
-rw-r--r-- | pkgs/tools/networking/grpc_cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/mtr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/subfinder/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/gjo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/typstfmt/Cargo.lock | 38 | ||||
-rw-r--r-- | pkgs/tools/typesetting/typstfmt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/wayland/way-displays/default.nix | 4 |
14 files changed, 229 insertions, 39 deletions
diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index ff38638d5bca..5307b38a108a 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.180"; + version = "3.0.181"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-w1t1sx7Pcv444x3YPNSg3fRQdPga2Q9Z1+Iad7OTjOM="; + sha256 = "sha256-xjOoWQyQCVoCDJMXboxFAyil7jRCWU6oIEt7gcPkIPo="; }; - vendorHash = "sha256-bL1S6GML7XuLraVXcd6NcC3VSYAd05F2ktzI0KF3G8A="; + vendorHash = "sha256-S8Nthnr3wASvRyZS5UTHILPnUA+FeZJEwIvT0O39U3I="; subPackages = [ "main" ]; diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix index 689758de2031..041a9fc59904 100644 --- a/pkgs/tools/graphics/textplots/default.nix +++ b/pkgs/tools/graphics/textplots/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "textplots"; - version = "0.8.2"; + version = "0.8.3"; src = fetchCrate { inherit pname version; - hash = "sha256-NBUp5kFiODqoJrg/JBPhtaVsOikppqt2jbd3C3RQ7qg="; + hash = "sha256-rYUo8A5jasGQb9CjW5u5kM7PIocq353R6v+Z7OhzVUg="; }; - cargoHash = "sha256-hHj3Da399gbRbgHgHcBE53HJusWoPbRA184tcCSJ4fc="; + cargoHash = "sha256-1Z+Og3n9/LUzfBoWNXjvNfuQByEq3vtXhGzi6X961w0="; meta = with lib; { description = "Terminal plotting written in Rust"; diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/tools/llm/open-interpreter/default.nix new file mode 100644 index 000000000000..281f77bf2a50 --- /dev/null +++ b/pkgs/tools/llm/open-interpreter/default.nix @@ -0,0 +1,52 @@ +{ lib +, python3 +, fetchFromGitHub +}: +let + version = "0.1.3"; +in +python3.pkgs.buildPythonApplication { + pname = "open-interpreter"; + format = "pyproject"; + inherit version; + + src = fetchFromGitHub { + owner = "KillianLucas"; + repo = "open-interpreter"; + rev = "v${version}"; + hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + astor + gitpython + huggingface-hub + inquirer + litellm + openai + # pyreadline3 # this is a windows deps + python-dotenv + rich + six + tiktoken + tokentrim + wget + ]; + + # the import check phase fails trying to do a network request to openai + # because of litellm + # pythonImportsCheck = [ "interpreter" ]; + + meta = with lib; { + description = "OpenAI's Code Interpreter in your terminal, running locally"; + homepage = "https://github.com/KillianLucas/open-interpreter"; + license = licenses.mit; + changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 6fb4c5df775d..1e9b16a84855 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, asar }: let pname = "flexoptix-app"; - version = "5.13.4"; + version = "5.16.0-latest"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-W+9KmKZ1bPfQfv1DXCJrIswriw4ivBVZPW81tfvRBc0="; + hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg="; }; udevRules = fetchurl { diff --git a/pkgs/tools/misc/near-cli/default.nix b/pkgs/tools/misc/near-cli/default.nix new file mode 100644 index 000000000000..8741f694782c --- /dev/null +++ b/pkgs/tools/misc/near-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "near-cli"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "near"; + repo = "near-cli"; + rev = "v${version}"; + hash = "sha256-C+viNYk+6BA11cdi5GqARU3QTTONTR2B2VEZf/SeeSQ="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-G/Y8xGGOlXH37Bup7mKhEaNh05GTP5CC9e/Xw4TBNMU="; + }; + + doDist = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/node_modules" + mv deps/near-cli "$out/lib/node_modules" + rm "$out/lib/node_modules/near-cli/node_modules" + mv node_modules "$out/lib/node_modules/near-cli" + + mkdir -p "$out/bin" + ln -s "$out/lib/node_modules/near-cli/bin/near" "$out/bin" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/near/near-cli/blob/${src.rev}/CHANGELOG.md"; + description = "General purpose command line tools for interacting with NEAR Protocol"; + homepage = "https://github.com/near/near-cli"; + license = with lib.licenses; [ asl20 mit ]; + mainProgram = "near"; + maintainers = with lib.maintainers; [ ekleog ]; + }; +} diff --git a/pkgs/tools/misc/near-cli/package.json b/pkgs/tools/misc/near-cli/package.json new file mode 100644 index 000000000000..a6b794a99115 --- /dev/null +++ b/pkgs/tools/misc/near-cli/package.json @@ -0,0 +1,83 @@ +{ + "name": "near-cli", + "version": "3.4.2", + "description": "General purpose command line tools for interacting with NEAR Protocol", + "engines": { + "node": ">= 12" + }, + "main": "index.js", + "scripts": { + "pretest": "rm -rf tmp-project", + "test": "npm run test:unit && npm run test:integration", + "test:unit": "jest", + "test:integration": "bash ./test/index.sh", + "lint": "eslint .", + "fix": "eslint . --fix" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/near/near-cli.git" + }, + "author": "Jane Degtiareva", + "license": "(MIT AND Apache-2.0)", + "bugs": { + "url": "https://github.com/near/near-cli/issues" + }, + "homepage": "https://github.com/near/near-cli#readme", + "bin": { + "near": "bin/near" + }, + "devDependencies": { + "danger": "^10.6.6", + "lodash": "^4.17.21", + "eslint": "^7.0.0", + "jest": "^26.1.0", + "strip-ansi": "^7.0.0", + "strip-ansi-cli": "^3.0.0", + "ts-node": "^10.4.0", + "typescript": "^4.5.4" + }, + "dependencies": { + "analytics-node": "^6.1.0", + "ascii-table": "0.0.9", + "bn.js": "^5.1.1", + "bs58": "^4.0.1", + "chalk": "^4.0.0", + "flagged-respawn": "^1.0.1", + "is-ci": "^2.0.0", + "jest-environment-node": "^27.0.6", + "ncp": "^2.0.0", + "near-api-js": "^0.44.2", + "near-seed-phrase": "^0.2.0", + "open": "^8.0.7", + "rimraf": "^3.0.0", + "stoppable": "^1.1.0", + "tcp-port-used": "^1.0.1", + "update-notifier": "^5.0.0", + "uuid": "^8.0.0", + "v8flags": "^3.1.3", + "yargs": "^16.0.3" + }, + "optionalDependencies": { + "@ledgerhq/hw-transport-node-hid": "^6.1.0", + "near-ledger-js": "^0.2.0" + }, + "keywords": [ + "blockchain", + "crypto", + "dapps", + "distributed", + "applications", + "distributed applications" + ], + "files": [ + "bin", + "commands", + "middleware", + "utils", + "config.js", + "get-config.js", + "test_environment.js", + "context" + ] +} diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 9cd4d34876cb..b2b84ea53e66 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-JxkQZSmI3FSAoSd45uciCpsTeGuAvRhG/BGyC4NKOjo="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index bf324c57d497..c586d6a75ef1 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libcap @@ -21,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM="; }; + patches = [ (fetchpatch { # https://github.com/traviscross/mtr/pull/468 + url = "https://github.com/traviscross/mtr/commit/5908af4c19188cb17b62f23368b6ef462831a0cb.patch"; + hash = "sha256-rTydtU8+Wc4nGEKh1GOkhcpgME4hwsACy82gKPaIe64="; + }) ]; + # we need this before autoreconfHook does its thing postPatch = '' echo ${version} > .tarball-version diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 4983c30ab00b..74fb6508794b 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation rec { description = "Network configuration and management tool"; license = licenses.gpl2Plus; changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz maxeaubrey ]); + maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz amaxine ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 7eaa8c24c524..6cd2ee26959f 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KyceWyVIgIPx4zw7pUCY2IC9PfbSYzwoDEbw80VhI+s="; + hash = "sha256-X1Ow11ECwu2a/VzimrKGRJKCnZWL8KJ5Gii+pjP5b9E="; }; - vendorHash = "sha256-vvgXlVPQPH6hO4yA3HYB0C6mva9eI2zMIlBhjtZXOTI="; + vendorHash = "sha256-T1xrJ44xB95+ZhQPCYlcbH1gIQm7ETtTnQLl/+TRxVA="; modRoot = "./v2"; diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index da8fa212940a..99d988797bfc 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "skanehira"; repo = "gjo"; rev = version; - sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; + hash = "sha256-vEk5MZqwAMgqMLjwRJwnbx8nVyF3U2iUz0S3L0GmCh4="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Small utility to create JSON objects"; diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index c4123f470f46..af461f991de2 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -198,9 +198,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "nu-ansi-term" @@ -250,13 +250,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "regex-syntax", ] @@ -268,9 +268,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -309,7 +309,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -375,9 +375,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -396,9 +396,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "serde", @@ -448,7 +448,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.2" +version = "0.2.3" dependencies = [ "lexopt", "typstfmt_lib", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.2" +version = "0.2.3" dependencies = [ "globmatch", "insta", @@ -559,9 +559,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 46298a0761e4..bb5495e83e4f 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-y6uXWKG3npgxIfZeou7Xs8/zqjIFB4BvciDmAJIXw78="; + hash = "sha256-DipssOPbu7rSyfhqpuOqS7Ih+/PlK+/BT+R1Sm4mFPk="; }; cargoLock = { diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index ea94ece408ce..bac42d39fd1a 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = version; - sha256 = "sha256-rR181sxaddtn3yFtF1exSGPBU0Yp3VBRyucfuxyXI+Q="; + sha256 = "sha256-X+/aM+/2pO1FbHGwEiC2w9AxPXHf1EVZkyr+CXtprLk="; }; strictDeps = true; |