mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2181c1e956
71 changed files with 5489 additions and 211 deletions
|
|
@ -25,6 +25,8 @@ These include `pkgs.nixosTest`, `testing-python.nix` and `make-test-python.nix`.
|
|||
|
||||
## Testing changes to the test framework {#sec-test-the-test-framework}
|
||||
|
||||
We currently have limited unit tests for the framework itself. You may run these with `nix-build -A nixosTests.nixos-test-driver`.
|
||||
|
||||
When making significant changes to the test framework, we run the tests on Hydra, to avoid disrupting the larger NixOS project.
|
||||
|
||||
For this, we use the `python-test-refactoring` branch in the `NixOS/nixpkgs` repository, and its [corresponding Hydra jobset](https://hydra.nixos.org/jobset/nixos/python-test-refactoring).
|
||||
|
|
|
|||
|
|
@ -130,6 +130,11 @@ starting them in parallel:
|
|||
start_all()
|
||||
```
|
||||
|
||||
If the hostname of a node contains characters that can't be used in a
|
||||
Python variable name, those characters will be replaced with
|
||||
underscores in the variable name, so `nodes.machine-a` will be exposed
|
||||
to Python as `machine_a`.
|
||||
|
||||
## Machine objects {#ssec-machine-objects}
|
||||
|
||||
The following methods are available on machine objects:
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ from contextlib import contextmanager
|
|||
from pathlib import Path
|
||||
from typing import Any, Dict, Iterator, List, Union, Optional, Callable, ContextManager
|
||||
import os
|
||||
import re
|
||||
import tempfile
|
||||
|
||||
from test_driver.logger import rootlog
|
||||
|
|
@ -28,6 +29,10 @@ def get_tmp_dir() -> Path:
|
|||
return tmp_dir
|
||||
|
||||
|
||||
def pythonize_name(name: str) -> str:
|
||||
return re.sub(r"^[^A-z_]|[^A-z0-9_]", "_", name)
|
||||
|
||||
|
||||
class Driver:
|
||||
"""A handle to the driver that sets up the environment
|
||||
and runs the tests"""
|
||||
|
|
@ -113,7 +118,7 @@ class Driver:
|
|||
polling_condition=self.polling_condition,
|
||||
Machine=Machine, # for typing
|
||||
)
|
||||
machine_symbols = {m.name: m for m in self.machines}
|
||||
machine_symbols = {pythonize_name(m.name): m for m in self.machines}
|
||||
# If there's exactly one machine, make it available under the name
|
||||
# "machine", even if it's not called that.
|
||||
if len(self.machines) == 1:
|
||||
|
|
|
|||
|
|
@ -21,29 +21,20 @@ let
|
|||
in
|
||||
nodesList ++ lib.optional (lib.length nodesList == 1 && !lib.elem "machine" nodesList) "machine";
|
||||
|
||||
# TODO: This is an implementation error and needs fixing
|
||||
# the testing famework cannot legitimately restrict hostnames further
|
||||
# beyond RFC1035
|
||||
invalidNodeNames = lib.filter
|
||||
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
|
||||
nodeHostNames;
|
||||
pythonizeName = name:
|
||||
let
|
||||
head = lib.substring 0 1 name;
|
||||
tail = lib.substring 1 (-1) name;
|
||||
in
|
||||
(if builtins.match "[A-z_]" head == null then "_" else head) +
|
||||
lib.stringAsChars (c: if builtins.match "[A-z0-9_]" c == null then "_" else c) tail;
|
||||
|
||||
uniqueVlans = lib.unique (builtins.concatLists vlans);
|
||||
vlanNames = map (i: "vlan${toString i}: VLan;") uniqueVlans;
|
||||
machineNames = map (name: "${name}: Machine;") nodeHostNames;
|
||||
pythonizedNames = map pythonizeName nodeHostNames;
|
||||
machineNames = map (name: "${name}: Machine;") pythonizedNames;
|
||||
|
||||
withChecks =
|
||||
if lib.length invalidNodeNames > 0 then
|
||||
throw ''
|
||||
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
|
||||
All machines are referenced as python variables in the testing framework which will break the
|
||||
script when special characters are used.
|
||||
|
||||
This is an IMPLEMENTATION ERROR and needs to be fixed. Meanwhile,
|
||||
please stick to alphanumeric chars and underscores as separation.
|
||||
''
|
||||
else
|
||||
lib.warnIf config.skipLint "Linting is disabled";
|
||||
withChecks = lib.warnIf config.skipLint "Linting is disabled";
|
||||
|
||||
driver =
|
||||
hostPkgs.runCommand "nixos-test-driver-${config.name}"
|
||||
|
|
@ -87,7 +78,7 @@ let
|
|||
${testDriver}/bin/generate-driver-symbols
|
||||
${lib.optionalString (!config.skipLint) ''
|
||||
PYFLAKES_BUILTINS="$(
|
||||
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
|
||||
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," pythonizedNames)},
|
||||
< ${lib.escapeShellArg "driver-symbols"}
|
||||
)" ${hostPkgs.python3Packages.pyflakes}/bin/pyflakes $out/test-script
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,15 @@ let
|
|||
;
|
||||
|
||||
in {
|
||||
|
||||
# Testing the test driver
|
||||
nixos-test-driver = {
|
||||
extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};
|
||||
node-name = runTest ./nixos-test-driver/node-name.nix;
|
||||
};
|
||||
|
||||
# NixOS vm tests and non-vm unit tests
|
||||
|
||||
_3proxy = runTest ./3proxy.nix;
|
||||
aaaaxy = runTest ./aaaaxy.nix;
|
||||
acme = runTest ./acme.nix;
|
||||
|
|
@ -220,7 +229,6 @@ in {
|
|||
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
|
||||
etebase-server = handleTest ./etebase-server.nix {};
|
||||
etesync-dav = handleTest ./etesync-dav.nix {};
|
||||
extra-python-packages = handleTest ./extra-python-packages.nix {};
|
||||
evcc = handleTest ./evcc.nix {};
|
||||
fancontrol = handleTest ./fancontrol.nix {};
|
||||
fcitx5 = handleTest ./fcitx5 {};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix ({ ... }:
|
||||
import ../make-test-python.nix ({ ... }:
|
||||
{
|
||||
name = "extra-python-packages";
|
||||
|
||||
33
nixos/tests/nixos-test-driver/node-name.nix
Normal file
33
nixos/tests/nixos-test-driver/node-name.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
name = "nixos-test-driver.node-name";
|
||||
nodes = {
|
||||
"ok" = { };
|
||||
|
||||
# Valid node name, but not a great host name.
|
||||
"one_two" = { };
|
||||
|
||||
# Valid node name, good host name
|
||||
"a-b" = { };
|
||||
|
||||
# TODO: would be nice to test these eval failures
|
||||
# Not allowed by lib/testing/network.nix (yet?)
|
||||
# "foo.bar" = { };
|
||||
# Not allowed.
|
||||
# "not ok" = { }; # not ok
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
with subtest("python vars exist and machines are reachable through test backdoor"):
|
||||
ok.succeed("true")
|
||||
one_two.succeed("true")
|
||||
a_b.succeed("true")
|
||||
|
||||
with subtest("hostname is derived from the node name"):
|
||||
ok.succeed("hostname | tee /dev/stderr | grep '^ok$'")
|
||||
one_two.succeed("hostname | tee /dev/stderr | grep '^onetwo$'")
|
||||
a_b.succeed("hostname | tee /dev/stderr | grep '^a-b$'")
|
||||
|
||||
'';
|
||||
}
|
||||
|
|
@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
+ lib.optionalString enableQt "-qt"
|
||||
+ lib.optionalString (!enableQt) "-sdl"
|
||||
+ lib.optionalString forceWayland "-wayland";
|
||||
version = "1.14.4";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc=";
|
||||
sha256 = "sha256-D42u3MP+JKO/1IrOWVliVg4flUJi/pADScbNktRP+bY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
4672
pkgs/applications/file-managers/xplorer/Cargo.lock
generated
Normal file
4672
pkgs/applications/file-managers/xplorer/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
94
pkgs/applications/file-managers/xplorer/default.nix
Normal file
94
pkgs/applications/file-managers/xplorer/default.nix
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
{ lib
|
||||
, cmake
|
||||
, dbus
|
||||
, fetchFromGitHub
|
||||
, fetchYarnDeps
|
||||
, freetype
|
||||
, gtk3
|
||||
, libsoup
|
||||
, mkYarnPackage
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
pname = "xplorer";
|
||||
version = "unstable-2023-03-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimlimjustin";
|
||||
repo = pname;
|
||||
rev = "8d69a281cbceda277958796cb6b77669fb062ee3";
|
||||
sha256 = "sha256-VFRdkSfe2mERaYYtZlg9dvH1loGWVBGwiTRj4AoNEAo=";
|
||||
};
|
||||
|
||||
frontend-build = mkYarnPackage {
|
||||
inherit version src;
|
||||
pname = "xplorer-ui";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
sha256 = "sha256-H37vD0GTSsWV5UH7C6UANDWnExTGh8yqajLn3y7P2T8=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
yarn --offline run prebuild
|
||||
|
||||
cp -r deps/xplorer/out $out
|
||||
'';
|
||||
|
||||
distPhase = "true";
|
||||
dontInstall = true;
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version src pname;
|
||||
|
||||
sourceRoot = "source/src-tauri";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-window-state-0.1.0" = "sha256-DkKiwBwc9jrxMaKWOyvl9nsBJW0jBe8qjtqIdKJmsnc=";
|
||||
"window-shadows-0.2.0" = "sha256-e1afzVjVUHtckMNQjcbtEQM0md+wPWj0YecbFvD0LKE=";
|
||||
"window-vibrancy-0.3.0" = "sha256-0psa9ZtdI0T6sC1RJ4GeI3w01FdO2Zjypuk9idI5pBY=";
|
||||
};
|
||||
};
|
||||
|
||||
# copy the frontend static resources to final build directory
|
||||
# Also modify tauri.conf.json so that it expects the resources at the new location
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
|
||||
mkdir -p frontend-build
|
||||
cp -R ${frontend-build}/src frontend-build
|
||||
|
||||
substituteInPlace tauri.conf.json --replace '"distDir": "../out/src",' '"distDir": "frontend-build/src",'
|
||||
'';
|
||||
|
||||
buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk cmake ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
checkFlags = [
|
||||
# tries to mutate the parent directory
|
||||
"--skip=test_file_operation"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/app $out/bin/xplorer
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A customizable, modern file manager";
|
||||
homepage = "https://xplorer.space";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
88
pkgs/applications/file-managers/xplorer/package.json
Normal file
88
pkgs/applications/file-managers/xplorer/package.json
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
{
|
||||
"name": "xplorer",
|
||||
"description": "Xplorer, a customizable, modern file manager",
|
||||
"version": "0.3.1",
|
||||
"author": "Justin Maximillian Kimlim <kimlimjustin@gmail.com>",
|
||||
"icon": "build/icon.icns",
|
||||
"private": true,
|
||||
"homepage": "https://xplorer.space",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/kimlimjustin/xplorer.git"
|
||||
},
|
||||
"os": ["darwin", "win32", "linux"],
|
||||
"scripts": {
|
||||
"start": "yarn dev",
|
||||
"web": "concurrently \"cd api/web && cargo run\" \"live-server ./out/src --no-browser\"",
|
||||
"dev": "yarn compile && concurrently --kill-others \"yarn compile:watch\" \"yarn sass:watch\" \"yarn web\" \"tauri dev\"",
|
||||
"clean": "rimraf out",
|
||||
"sass": "sass src/Public/style.scss out/src/Public/style.css",
|
||||
"sass:watch": "node scripts/sass-watcher.js",
|
||||
"docs": "yarn --cwd ./docs start",
|
||||
"pretest": "yarn compile",
|
||||
"test": "jest",
|
||||
"copyfiles": "node scripts/copyfiles",
|
||||
"compile": "webpack && yarn sass && yarn copyfiles",
|
||||
"compile:watch": "webpack --watch",
|
||||
"crowdin": "crowdin",
|
||||
"crowdin:pull": "crowdin pull",
|
||||
"postcrowdin:pull": "node scripts/post_crowdin_pull.js",
|
||||
"crowdin:sync": "yarn --cwd ./docs write-translations && crowdin upload && crowdin download",
|
||||
"lint": "eslint -c .eslintrc.yml --ext .ts ./src",
|
||||
"prettier": "prettier --write src",
|
||||
"grunt": "grunt",
|
||||
"css:minify": "cleancss --batch --batch-suffix \"\" out/**/*.css ",
|
||||
"prebuild": "yarn compile && yarn grunt && yarn css:minify",
|
||||
"build": "tauri build",
|
||||
"postinstall": "husky install",
|
||||
"fakefiles": "python scripts/generate-fake-files.py 1000"
|
||||
},
|
||||
"workspaces": ["packages/*"],
|
||||
"keywords": [
|
||||
"Xplorer",
|
||||
"File explorer",
|
||||
"File",
|
||||
"File manager",
|
||||
"Folders",
|
||||
"Directory"
|
||||
],
|
||||
"license": "Apache-2.0",
|
||||
"devDependencies": {
|
||||
"@crowdin/cli": "^3.6.5",
|
||||
"@tauri-apps/cli": "^1.1.1",
|
||||
"@types/jest": "^27.0.2",
|
||||
"@types/marked": "^4.0.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
||||
"@typescript-eslint/parser": "^5.4.0",
|
||||
"buffer": "^6.0.3",
|
||||
"clean-css-cli": "^5.3.3",
|
||||
"concurrently": "^6.2.1",
|
||||
"cpy": "^8.1.2",
|
||||
"eslint": "^8.2.0",
|
||||
"grunt": "^1.4.1",
|
||||
"grunt-cli": "^1.4.3",
|
||||
"grunt-contrib-uglify": "^5.0.1",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"husky": "^7.0.2",
|
||||
"jest": "^27.1.0",
|
||||
"live-server": "^1.2.1",
|
||||
"node-watch": "^0.7.1",
|
||||
"postinstall-postinstall": "^2.1.0",
|
||||
"prettier": "2.5.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "1.45.2",
|
||||
"ts-jest": "^27.0.7",
|
||||
"ts-loader": "^9.2.6",
|
||||
"typescript": "^4.4.2",
|
||||
"webpack": "^5.58.2",
|
||||
"webpack-cli": "^4.9.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^1.1.0",
|
||||
"highlight.js": "^11.2.0",
|
||||
"mammoth": "^1.4.18",
|
||||
"marked": "^4.0.15",
|
||||
"xlsx": "^0.17.1"
|
||||
},
|
||||
"optionalDependencies": {}
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
{ newScope, config, stdenv, fetchurl, makeWrapper
|
||||
, llvmPackages_15
|
||||
, llvmPackages_16
|
||||
, ed, gnugrep, coreutils, xdg-utils
|
||||
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
|
||||
|
|
@ -19,7 +18,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
llvmPackages = llvmPackages_15;
|
||||
llvmPackages = llvmPackages_16;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
|
||||
|
|
@ -54,9 +53,6 @@ let
|
|||
inherit (upstream-info.deps.gn) url rev sha256;
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (chromiumVersionAtLeast "113") rec {
|
||||
llvmPackages = llvmPackages_16;
|
||||
stdenv = llvmPackages_16.stdenv;
|
||||
});
|
||||
|
||||
browser = callPackage ./browser.nix {
|
||||
|
|
|
|||
|
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "112.0.5615.165",
|
||||
"sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n",
|
||||
"sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm",
|
||||
"version": "113.0.5672.64",
|
||||
"sha256": "0knw3i37hh874ycjlc8bl68wdhyqhma5pn7alwa6254qr5dkci9h",
|
||||
"sha256bin64": null,
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-02-17",
|
||||
"version": "2023-03-18",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108",
|
||||
"sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c"
|
||||
"rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
|
||||
"sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "112.0.5615.165-1",
|
||||
"sha256": "1q2870z4k2hkn3jh24xc0xiadd1sxc4apn1jz740yzlwsi6jmcgw"
|
||||
"rev": "113.0.5672.64-1",
|
||||
"sha256": "0xvgq6971qvvn0cf4z5wkfabhm7dsx2f68npfl4y2nix7hwfs6lq"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.0.65";
|
||||
version = "1.0.83";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rj6A1h5R4w8zacoTV0WKTbTD67qwsw4zHP+KQ6h7/gs=";
|
||||
sha256 = "sha256-2tCBFc4CEgaYJq5fMbHi+M/Cz5Eeo2Slqgu9xUUkUjA=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mkDerivation
|
||||
, pkg-config
|
||||
|
|
@ -7,12 +8,13 @@
|
|||
, callPackage
|
||||
, qtbase
|
||||
, qtkeychain
|
||||
, wrapQtAppsHook
|
||||
, qttools
|
||||
, sqlite
|
||||
, libsecret
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "3.2.1";
|
||||
|
||||
|
|
@ -25,12 +27,8 @@ mkDerivation rec {
|
|||
hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
|
||||
buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ];
|
||||
buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-UCMAKE_INSTALL_LIBDIR"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mkDerivation
|
||||
, cmake
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libre-graph-api-cpp-qt-client";
|
||||
version = "0.13.2";
|
||||
|
||||
|
|
@ -18,7 +19,7 @@ mkDerivation rec {
|
|||
|
||||
sourceRoot = "source/client";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
cmakeFlags = [ ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }:
|
||||
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, stdenv, testers, gh }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
|
|
@ -15,27 +15,23 @@ buildGoModule rec {
|
|||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# upstream unsets these to handle cross but it breaks our build
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages
|
||||
make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 bin/gh -t $out/bin
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installManPage share/man/*/*.[1-9]
|
||||
|
||||
installShellCompletion --cmd gh \
|
||||
--bash <($out/bin/gh completion -s bash) \
|
||||
--fish <($out/bin/gh completion -s fish) \
|
||||
--zsh <($out/bin/gh completion -s zsh)
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -28,4 +28,5 @@ in lib.concatLists [
|
|||
"--with-long-double-128"
|
||||
"--with-long-double-format=${gcc.long-double-format or "ieee"}"
|
||||
]))
|
||||
(lib.optional targetPlatform.isMips64n32 "--disable-libsanitizer") # libsanitizer does not compile on mips64n32
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcotp";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paolostivanin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-99Uw/BMk2bLj+/FZd7MwrRw62XcCroO9yNWdtH5AFpE=";
|
||||
sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ let
|
|||
qt3d = callPackage ../modules/qt3d.nix {};
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {
|
||||
|
|
@ -215,7 +216,7 @@ let
|
|||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
qtwebview qtx11extras qtxmlpatterns qtlottie
|
||||
qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d
|
||||
] ++ lib.optional (!stdenv.isDarwin) qtwayland
|
||||
++ lib.optional (stdenv.isDarwin) qtmacextras);
|
||||
|
||||
|
|
|
|||
9
pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix
Normal file
9
pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{ lib, stdenv, qtModule, qtbase, qtdeclarative }:
|
||||
|
||||
qtModule {
|
||||
pname = "qtdatavis3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
# error: use of undeclared identifier 'stat64'
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat";
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/github/data.nix
Normal file
23
pkgs/development/ocaml-modules/github/data.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, github
|
||||
, yojson, atdgen
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "github-data";
|
||||
inherit (github) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
atdgen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
yojson
|
||||
atdgen
|
||||
];
|
||||
|
||||
meta = github.meta // {
|
||||
description = "GitHub APIv3 data library";
|
||||
};
|
||||
}
|
||||
34
pkgs/development/ocaml-modules/github/default.nix
Normal file
34
pkgs/development/ocaml-modules/github/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, uri, cohttp, lwt, cohttp-lwt, github-data, yojson, stringext
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "github";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirage";
|
||||
repo = "ocaml-github";
|
||||
rev = version;
|
||||
sha256 = "sha256-psUIiIvjVV2NTlBtHnBisWreaKKnsqIjKT2+mLnfsxg=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
uri
|
||||
cohttp
|
||||
lwt
|
||||
cohttp-lwt
|
||||
github-data
|
||||
yojson
|
||||
stringext
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mirage/ocaml-github";
|
||||
description = "GitHub APIv3 OCaml library";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ niols ];
|
||||
};
|
||||
}
|
||||
21
pkgs/development/ocaml-modules/github/jsoo.nix
Normal file
21
pkgs/development/ocaml-modules/github/jsoo.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ lib, buildDunePackage, github
|
||||
, cohttp, cohttp-lwt-jsoo, js_of_ocaml-lwt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "github-jsoo";
|
||||
inherit (github) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
github
|
||||
cohttp
|
||||
cohttp-lwt-jsoo
|
||||
js_of_ocaml-lwt
|
||||
];
|
||||
|
||||
meta = github.meta // {
|
||||
description = "GitHub APIv3 JavaScript library";
|
||||
};
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/github/unix.nix
Normal file
23
pkgs/development/ocaml-modules/github/unix.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, github
|
||||
, cohttp, cohttp-lwt-unix, stringext, cmdliner, lwt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "github-unix";
|
||||
inherit (github) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
github
|
||||
cohttp
|
||||
cohttp-lwt-unix
|
||||
stringext
|
||||
cmdliner
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = github.meta // {
|
||||
description = "GitHub APIv3 Unix library";
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ rec {
|
|||
pname = "linol";
|
||||
version = "2023-04-25";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.14";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -84,11 +84,31 @@ buildDunePackage rec {
|
|||
|
||||
nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs =
|
||||
if lib.versionAtLeast version "1.14.0" then [
|
||||
jsonrpc
|
||||
ppx_yojson_conv_lib
|
||||
uutf
|
||||
] else if lib.versionAtLeast version "1.10.0" then [
|
||||
dyn
|
||||
jsonrpc
|
||||
ordering
|
||||
ppx_yojson_conv_lib
|
||||
stdune
|
||||
uutf
|
||||
] else if lib.versionAtLeast version "1.7.0" then [
|
||||
csexp
|
||||
jsonrpc
|
||||
pp
|
||||
ppx_yojson_conv_lib
|
||||
uutf
|
||||
] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
|
||||
] else [
|
||||
csexp
|
||||
jsonrpc
|
||||
ppx_yojson_conv_lib
|
||||
stdlib-shims
|
||||
uutf
|
||||
];
|
||||
|
||||
meta = jsonrpc.meta // {
|
||||
description = "LSP protocol implementation in OCaml";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudscraper";
|
||||
version = "1.2.69";
|
||||
version = "1.2.71";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H/S+/urmOmcHbAJkUVFik1mB3V1RVS8FLcJmv2SZc0U=";
|
||||
hash = "sha256-QpxuiqaRbVutXIperFDz6lPJrCJhb2yyGxjcxxUX0NM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Rapptz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1XK9HRSdIhlunSno3FpvD3dIgZ4zbpSTS9kxj+8+S3g=";
|
||||
hash = "sha256-Rh3gijm67LVyOaliP7w3YwKviKydnxXvu4snNrM5H1c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-azure";
|
||||
version = "2.21.0";
|
||||
version = "2.21.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VN3QSGb4cLhxX8JV1Pg4/449SJOWv9Tu3kcDGbDwAYw=";
|
||||
hash = "sha256-0PB+2lPAV2yy2hivDDz0PXmi8WqoSlUZadyfKPp9o1g=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-gs";
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MGNDEhJJGSQIPDXGv/y4u1UHnh4HnNbKtQbGHys0dSA=";
|
||||
hash = "sha256-UzYW2iU/GvLJd4q6ErcLQRoAehyFF3PrMTjb8PEtmNE=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-s3";
|
||||
version = "2.21.0";
|
||||
version = "2.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AEB5Nyp6j7mX0AOA0rhegd4q8xP/POx9J6yn1Ppu0nk=";
|
||||
hash = "sha256-19j/JD8KZEQKaj55HYEucHwh/LUJ+88PPFEqAWov2Gg=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-ssh";
|
||||
version = "2.21.0";
|
||||
version = "2.22.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iew/+/Ww6Uvz6Ctvswd8l5YFa3zihYxo1jvTe0ZTW9M=";
|
||||
hash = "sha256-WHFfq0Cw17AWgmUlkZUOO6t6XcPYjLHUz4s0wcVYklc=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-studio-client";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Uk9P/QUlvu3XgGMGZF7d2dPJyYKe3/Ex68HVP8eZqU0=";
|
||||
hash = "sha256-yiNhvemeN3Dbs8/UvdTsy0K/FORoAy27tvT4ElwFxRk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "elkm1-lib";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "gwww";
|
||||
repo = "elkm1";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UrdnEafmzO/l1kTcGmPWhujbThVWv4uBH57D2uZB/kw=";
|
||||
hash = "sha256-z/ltpypCGJ3ORHOlLjicKlqIoxqGzVt588OHmNO65bg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hijri-converter";
|
||||
version = "2.2.4";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nh2fpMIg9oZ9oquxqWJAZ1rpdKu6lRxoangfTvasIY8=";
|
||||
hash = "sha256-BptniSkeCDD0hgp53NNPs87qO5VRbtQBAgK5ZWuhq2E=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -28,6 +28,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
|
||||
homepage = "https://github.com/dralshehri/hijri-converter";
|
||||
changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.21.13";
|
||||
version = "0.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dr-prodigy";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-acV/m4orkOEbON7C4ThGvaQtTMpp4c8FNesC7UepJFc=";
|
||||
hash = "sha256-1/rphnbzDlbay+yez/erF+WC+2aqeBEgdcHo2YR+ugc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -38,6 +38,11 @@ buildPythonPackage rec {
|
|||
"holidays"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Failure starting with 0.24
|
||||
"test_l10n"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate and work with holidays in Python";
|
||||
homepage = "https://github.com/dr-prodigy/python-holidays";
|
||||
|
|
|
|||
219
pkgs/development/python-modules/langchain/default.nix
Normal file
219
pkgs/development/python-modules/langchain/default.nix
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, poetry-core
|
||||
, numpy
|
||||
, pyyaml
|
||||
, sqlalchemy
|
||||
, requests
|
||||
, async-timeout
|
||||
, aiohttp
|
||||
, numexpr
|
||||
, openapi-schema-pydantic
|
||||
, dataclasses-json
|
||||
, tqdm
|
||||
, tenacity
|
||||
, bash
|
||||
# optional dependencies
|
||||
, openai
|
||||
, huggingface-hub
|
||||
, torch
|
||||
, transformers
|
||||
, qdrant-client
|
||||
, sentence-transformers
|
||||
, azure-identity
|
||||
, azure-cosmos
|
||||
, azure-core
|
||||
, elasticsearch
|
||||
, opensearch-py
|
||||
, faiss
|
||||
, spacy
|
||||
, nltk
|
||||
, beautifulsoup4
|
||||
, tiktoken
|
||||
, jinja2
|
||||
, pinecone-client
|
||||
, weaviate-client
|
||||
, redis
|
||||
, google-api-python-client
|
||||
, pypdf
|
||||
, networkx
|
||||
, psycopg2
|
||||
, boto3
|
||||
, pyowm
|
||||
, pytesseract
|
||||
, html2text
|
||||
, atlassian-python-api
|
||||
, duckduckgo-search
|
||||
, lark
|
||||
# test dependencies
|
||||
, pytest-vcr
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pandas
|
||||
, toml
|
||||
, freezegun
|
||||
, responses
|
||||
, pexpect
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.0.158";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hwchase17";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R8l7Y33CiTL4px5A7rB6PHMnSjvINZBrgANwUMFkls8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace langchain/utilities/bash.py \
|
||||
--replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", ['
|
||||
substituteInPlace tests/unit_tests/test_bash.py \
|
||||
--replace "/bin/sh" "${bash}/bin/sh"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pyyaml
|
||||
sqlalchemy
|
||||
requests
|
||||
aiohttp
|
||||
numexpr
|
||||
openapi-schema-pydantic
|
||||
dataclasses-json
|
||||
tqdm
|
||||
tenacity
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
async-timeout
|
||||
] ++ passthru.optional-dependencies.all;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
llms = [
|
||||
# anthropic
|
||||
# cohere
|
||||
openai
|
||||
# nlpcloud
|
||||
huggingface-hub
|
||||
# manifest-ml
|
||||
torch
|
||||
transformers
|
||||
];
|
||||
qdrant = [
|
||||
qdrant-client
|
||||
];
|
||||
openai = [
|
||||
openai
|
||||
];
|
||||
cohere = [
|
||||
# cohere
|
||||
];
|
||||
embeddings = [
|
||||
sentence-transformers
|
||||
];
|
||||
azure = [
|
||||
azure-identity
|
||||
azure-cosmos
|
||||
openai
|
||||
azure-core
|
||||
];
|
||||
all = [
|
||||
# anthropic
|
||||
# cohere
|
||||
openai
|
||||
# nlpcloud
|
||||
huggingface-hub
|
||||
# jina
|
||||
# manifest-ml
|
||||
elasticsearch
|
||||
opensearch-py
|
||||
# google-search-results
|
||||
faiss
|
||||
sentence-transformers
|
||||
transformers
|
||||
spacy
|
||||
nltk
|
||||
# wikipedia
|
||||
beautifulsoup4
|
||||
tiktoken
|
||||
torch
|
||||
jinja2
|
||||
pinecone-client
|
||||
# pinecone-text
|
||||
weaviate-client
|
||||
redis
|
||||
google-api-python-client
|
||||
# wolframalpha
|
||||
qdrant-client
|
||||
# tensorflow-text
|
||||
pypdf
|
||||
networkx
|
||||
# nomic
|
||||
# aleph-alpha-client
|
||||
# deeplake
|
||||
# pgvector
|
||||
psycopg2
|
||||
boto3
|
||||
pyowm
|
||||
pytesseract
|
||||
html2text
|
||||
atlassian-python-api
|
||||
# gptcache
|
||||
duckduckgo-search
|
||||
# arxiv
|
||||
azure-identity
|
||||
# clickhouse-connect
|
||||
azure-cosmos
|
||||
# lancedb
|
||||
lark
|
||||
pexpect
|
||||
# pyvespa
|
||||
# O365
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-vcr
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
pandas
|
||||
toml
|
||||
freezegun
|
||||
responses
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# integration_tests have many network, db access and require `OPENAI_API_KEY`, etc.
|
||||
rm -r tests/integration_tests
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# these tests have db access
|
||||
"test_table_info"
|
||||
"test_sql_database_run"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Building applications with LLMs through composability";
|
||||
homepage = "https://github.com/hwchase17/langchain";
|
||||
changelog = "https://github.com/hwchase17/langchain/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openapi-schema-pydantic";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PiLPWLdKafdSzH5fFTf25EFkKC2ycAy7zTu5nd0GUZY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pydantic
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests are broken with `pydantic >= 1.10`
|
||||
# but this library seems to work fine.
|
||||
# e.g. https://github.com/hwchase17/langchain/blob/d86ed15d8884d5a3f120a433b9dda065647e4534/poetry.lock#L6011-L6012
|
||||
"test_pydantic_discriminator_schema_generation"
|
||||
"test_pydantic_discriminator_openapi_generation"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenAPI (v3) specification schema as pydantic class";
|
||||
homepage = "https://github.com/kuimono/openapi-schema-pydantic";
|
||||
changelog = "https://github.com/kuimono/openapi-schema-pydantic/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.134";
|
||||
version = "2.1.135";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hVh8N/eTJL5HpxIUkLsnD985zm1pGnD5YDgwJ/3N6dU=";
|
||||
hash = "sha256-h6nv91IkI+6+cLHS8CYwm9tddbjiOOWsdk1+17PutvU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slackclient";
|
||||
version = "3.20.1";
|
||||
version = "3.21.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w=";
|
||||
hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ buildPythonPackage rec {
|
|||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
license = licenses.bsd3;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "webauthn";
|
||||
version = "1.7.2";
|
||||
version = "1.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "duo-labs";
|
||||
repo = "py_webauthn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B8GdtaufMMl0gHywZ00wNyYZ+rojrExKuQsA/vmbYRI=";
|
||||
hash = "sha256-ivPLS+kh/H8qLojgc5qh1ndPzSZbzbnm9E+LQGq8+Xs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
, nodejs_16
|
||||
, stdenv
|
||||
, which
|
||||
, buildPackages
|
||||
, runtimeShell
|
||||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "github-runner";
|
||||
|
|
@ -21,11 +23,41 @@ buildDotnetModule rec {
|
|||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w5MqFIPTCAqQjdsWdscNnH2KNwUOp5SPFesyprXUvNE=";
|
||||
# Required to obtain HEAD's Git commit hash
|
||||
hash = "sha256-5amc0oVcFCPFrUcX5iITjnN9Mtpzi4wWsJe7Kdm9YxA=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
# The git commit is read during the build and some tests depends on a git repo to be present
|
||||
# https://github.com/actions/runner/blob/22d1938ac420a4cb9e3255e47a91c2e43c38db29/src/dir.proj#L5
|
||||
unpackPhase = ''
|
||||
cp -r $src $TMPDIR/src
|
||||
chmod -R +w $TMPDIR/src
|
||||
cd $TMPDIR/src
|
||||
(
|
||||
export PATH=${buildPackages.git}/bin:$PATH
|
||||
git init
|
||||
git config user.email "root@localhost"
|
||||
git config user.name "root"
|
||||
git add .
|
||||
git commit -m "Initial commit"
|
||||
git checkout -b v${version}
|
||||
)
|
||||
mkdir -p $TMPDIR/bin
|
||||
cat > $TMPDIR/bin/git <<EOF
|
||||
#!${runtimeShell}
|
||||
if [ \$# -eq 1 ] && [ "\$1" = "rev-parse" ]; then
|
||||
echo $(cat $TMPDIR/src/.git-revision)
|
||||
exit 0
|
||||
fi
|
||||
exec ${buildPackages.git}/bin/git "\$@"
|
||||
EOF
|
||||
chmod +x $TMPDIR/bin/git
|
||||
export PATH=$TMPDIR/bin:$PATH
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Replace some paths that originally point to Nix's read-only store
|
||||
|
|
@ -66,8 +98,8 @@ buildDotnetModule rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
which
|
||||
git
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
autoPatchelfHook
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.9.2";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lRJCRdt/LIFG6MmCkzlvp77CxM4Md7+eyyiw32Xz9rw=";
|
||||
sha256 = "sha256-groih0LxtmB8k4/vfw2Ivtzm+SOyQqK1o7XASNplFvQ=";
|
||||
};
|
||||
vendorHash = "sha256-1+uB/UuwrZw17eSRLwcER67z/Qxg2H04vbBdk2FKYf0=";
|
||||
vendorHash = "sha256-Rm5fpiTZMo/B9+yIpmEniJVRfKgHjpFIagELEjgFYwc=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "15.4.0";
|
||||
version = "15.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xrSMR16KvS97/pfQPwOfETvVvTxqZMdNR7xG9QxuelA=";
|
||||
hash = "sha256-D1X0/r/OyQKPPE1aEwNVdGJYq6+i67xTvIQK3ZeI7pM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4exLY24baDjgGIDS1P7BIK38O4b+KeqNTMzA6wap05k=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.15.1";
|
||||
version = "2.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-LxAqRkjagoHv8mLA0ysgQozIFV3gBSr0zFSN5cH8NnI=";
|
||||
hash = "sha256-PxCVBi/GMzyTs9GfIAAPHNbinexw4guSO8ZsyZIOmr4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE=";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-dist";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axodotdev";
|
||||
repo = "cargo-dist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AbEreN8pv/aZoBX1amoihb6HxWRdMuEX0waBlbvueQw=";
|
||||
hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U2pTvTk6oc6PV4W4XBKLzsaqSTb7Oqyw2Ponc9H0xs8=";
|
||||
cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.14.8";
|
||||
version = "1.14.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-x7Pcg2zgu2s+oLkOJj+Eo/Gs48BJO6+JATckMqaeaj4=";
|
||||
hash = "sha256-dfUXH7MRTnHYSqNJzlT0fUn/Er0wrTARq3ZuOdWToow=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4se9/lcVWAWhbi0i3FDGQraK5KhPZ6ongc2wmJV4gI0=";
|
||||
cargoHash = "sha256-+u/3XtC/HxtAsX4dRf74u0BLh872Y2kK+BnbWqUnUdo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddcci-driver";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
name = "${pname}-${kernel.version}-${version}";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "${pname}-linux";
|
||||
repo = "${pname}-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "sSmL8PqxqHHQiume62si/Kc9El58/b4wkB93iG0dnNM=";
|
||||
hash = "sha256-1Z6V/AorD4aslLKaaCZpmkD2OiQnmpu3iroOPlNPtLE=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
|
@ -32,14 +32,6 @@ stdenv.mkDerivation rec {
|
|||
"INCLUDEDIR=$(out)/include"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix to support linux 6.1
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/ce52d6ac5e5ed7119a0028eed8823117a004766e.patch";
|
||||
sha256 = "sha256-Tmf4oiMWLR5ma/3X0eoFuriK29HwDqy6dBT7WdqE3mI=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kernel module driver for DDC/CI monitors";
|
||||
homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
|
||||
buildGoModule rec {
|
||||
pname = "mimir";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "${pname}-${version}";
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
sha256 = "sha256-5rj7qTomHiplCMcAsKCquH5Z94Syk43Ggoq+Mo1heQA=";
|
||||
sha256 = "sha256-gVt334HTKOotRaO1ga774FaxpblADpgdTtucADOHsCE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2O7M9K3NLa86tzezs+HL49ja+hhcKCmj5KdxpUjzm5Q=";
|
||||
sha256 = "sha256-9LIOBfNOa+u7yLL7iWb/e7c8ZSiyjukqaY0ifVR2iSs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KV7FmJQZj5QFPUZZjjOw9RTanq4MQtFi8qM90Pq1xTs=";
|
||||
vendorHash = "sha256-LFIJClPByaLXtsBOk7SjpJlIuQhWbVIs6H4PXhd7oyo=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wishlist";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "wishlist";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rC/MS4YNzeqrXExfNGsPLHWvqOxypoeELzwoy+57HXo=";
|
||||
sha256 = "sha256-O2ciXaWH2QSoqDTnDxmqwgK/BM5WHye8JHfw9+zZxZ4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZWgqp8UlpBHDYORSnWDuwB7DQQFUG4FAF/kUpR9LA6w=";
|
||||
vendorHash = "sha256-wZugmCP3IouZ9pw3NEAZcoqdABMGTVi/IcithQjVFW4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-forgit";
|
||||
version = "23.04.0";
|
||||
version = "23.05.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U=";
|
||||
sha256 = "sha256-oBPN8ehz00cDIs6mmGfCBzuDQMLG5z3G6KetJ1FK7e8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aws-lambda-runtime-interface-emulator";
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lambda-runtime-interface-emulator";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sRb1JYSAveei/X1m5/xfuGZFUwBopczrz1n+8gn4eKw=";
|
||||
sha256 = "sha256-N5RTMShukJCiM0NYzFsANUDww8iLT/p7Li0hAXerjAM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9aSALE42M/DoQS4PBHIVNDKzNdL5UhdXKAmLUSws3+Y=";
|
||||
vendorHash = "sha256-AZDbBFF7X247AYOVvJ5vuzuVqHqH6MbUylF5lRamzhU=";
|
||||
|
||||
# disabled because I lack the skill
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gocryptfs";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfjakob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mfbdxKZdYDbnNWQTrDV+4E6WYA8ybE5oiAH1WWOZHdQ=";
|
||||
sha256 = "sha256-1+g8n6n2i7UKr4C5ZLNF5ceqdu3EYx4R6rQALVoGwTs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eibUACIOfIsCgPYJ57Hq29S80XT6w4VbpjvaX7XasdE=";
|
||||
vendorHash = "sha256-7eAyuyqAvFQjkvsrkJEvop0veX7sGGX6xXAdUNuOXWU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
46
pkgs/tools/games/ukmm/Cargo.lock
generated
46
pkgs/tools/games/ukmm/Cargo.lock
generated
|
|
@ -3105,48 +3105,6 @@ version = "2.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
|
||||
|
||||
[[package]]
|
||||
name = "phf"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
|
||||
dependencies = [
|
||||
"phf_macros",
|
||||
"phf_shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "phf_generator"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
|
||||
dependencies = [
|
||||
"phf_shared",
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "phf_macros"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
|
||||
dependencies = [
|
||||
"phf_generator",
|
||||
"phf_shared",
|
||||
"proc-macro2 1.0.56",
|
||||
"quote 1.0.26",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "phf_shared"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
|
||||
dependencies = [
|
||||
"siphasher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pico-args"
|
||||
version = "0.4.2"
|
||||
|
|
@ -3663,8 +3621,6 @@ checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9"
|
|||
dependencies = [
|
||||
"crc 2.1.0",
|
||||
"include-flate",
|
||||
"phf",
|
||||
"roead",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
|
|
@ -4780,7 +4736,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ukmm"
|
||||
version = "0.8.0"
|
||||
version = "0.8.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"anyhow_ext",
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ukmm";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NiceneNerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qd2Sa5d4mKLsnBKPLawCw7Db2bT8+AAYHUQrjL6wExo=";
|
||||
sha256 = "sha256-YgM1qb4/wng9A6lAjg2z1oev+dE90o+39TTeIN5Sepw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
source 'https://rubygems.org' do
|
||||
gem "chef-cli"
|
||||
end
|
||||
source 'https://rubygems.org'
|
||||
gem "chef-cli"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
source 'https://rubygems.org' do
|
||||
gem "inspec"
|
||||
gem "inspec-bin"
|
||||
end
|
||||
source 'https://rubygems.org'
|
||||
gem "inspec"
|
||||
gem "inspec-bin"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, nimPackages, fetchFromGitHub }:
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "promexplorer";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
nimBinOnly = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcusramberg";
|
||||
repo = "promexplorer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Fj3RCVygixs+iIlLptX6aOsG4jJa/jUN8hXYkjZ7K/A=";
|
||||
hash = "sha256-a+9afqdgLgGf2hOWf/QsElq+CurDfE1qDmYCzodZIDU=";
|
||||
};
|
||||
|
||||
buildInputs = with nimPackages; [ illwill illwillwidgets ];
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
source 'https://rubygems.org' do
|
||||
gem 'serverspec'
|
||||
end
|
||||
source 'https://rubygems.org'
|
||||
gem 'serverspec'
|
||||
|
|
|
|||
|
|
@ -30,16 +30,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.17.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GSLEuelm6BEVF6NApYFJHa9bediRGoi5JotWPzDi+hg=";
|
||||
sha256 = "sha256-uz2WrPKNgYP8texn2wmGEnX4HS+HcF73iCJLTTAzX6g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lag/usfAvpZhWeVe1wB3SJJsTCLcBeh04RvkE803OqQ=";
|
||||
vendorHash = "sha256-hXoHdcoXsT3ap0Ns2seAaoMeQlwbp0WrqjoSH6Y/H+E=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfortivpn";
|
||||
version = "1.20.1";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrienverge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ=";
|
||||
sha256 = "sha256-Ml1aVvF+kqlSTuzZeHG8Ry+BA24YdWACwQNlO2K+FGo=";
|
||||
};
|
||||
|
||||
# we cannot write the config file to /etc and as we don't need the file, so drop it
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "subfinder";
|
||||
version = "2.5.7";
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hDuRHjFl4vsQQHp/juwVPDNUZMBMGfLxyMdeUzWaPng=";
|
||||
sha256 = "sha256-/q6ES1fW9/vxe03w73VyAHfOZNK6g5hxwi3qhxCiN6M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qN3XX8gA61UngzDAWwrPHRJGIDoNFE44lSAtMaP6vpM=";
|
||||
vendorHash = "sha256-sUkSxpWDqBe15BFVGNHTF1lV2mXZ0kjevMvdHtuNjXs=";
|
||||
|
||||
modRoot = "./v2";
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "urlwatch";
|
||||
version = "2.26";
|
||||
version = "2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thp";
|
||||
repo = "urlwatch";
|
||||
rev = version;
|
||||
hash = "sha256-EdRHwUHnAwum7UIgzmETeuQSyisb4zrmWGPgo7RewWQ=";
|
||||
hash = "sha256-dGohG2+HrsuKegPAn1fmpLYPpovEEUsx+C/0sp2/cX0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0P7mcrswWvyqv7a/jyONt/3BSim0IvQUgzjO7swTWn0=";
|
||||
hash = "sha256-xgSRaGS09a1d1qepzvkTuMtaUHh8QsKxF7RWD+0Sepg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MMEkgGyetwMEiD242CPYh619o4bo4zj87jnl7HvS0OE=";
|
||||
vendorHash = "sha256-9tNEPgJJ4mp4DPNgIzezS9Axed3XoJV9cyTYCOGMvgA=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zim-tools";
|
||||
version = "3.1.1";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = "zim-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-xZae1o4L9AdGDqBnFDZniWNM/dLsYRcS0OLWw9+Wecs=";
|
||||
sha256 = "sha256-dFZd+vr/PnC7WKTFitwBe1zd/1TUnCznI/eS+Q0ZZPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2554,6 +2554,8 @@ with pkgs;
|
|||
|
||||
xplr = callPackage ../applications/file-managers/xplr { };
|
||||
|
||||
xplorer = callPackage ../applications/file-managers/xplorer { };
|
||||
|
||||
ytree = callPackage ../applications/file-managers/ytree { };
|
||||
|
||||
### APPLICATIONS/TERMINAL-EMULATORS
|
||||
|
|
|
|||
|
|
@ -571,6 +571,11 @@ let
|
|||
git-binary = pkgs.git;
|
||||
};
|
||||
|
||||
github = callPackage ../development/ocaml-modules/github { };
|
||||
github-data = callPackage ../development/ocaml-modules/github/data.nix { };
|
||||
github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { };
|
||||
github-unix = callPackage ../development/ocaml-modules/github/unix.nix { };
|
||||
|
||||
gluten = callPackage ../development/ocaml-modules/gluten { };
|
||||
gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { };
|
||||
gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { };
|
||||
|
|
|
|||
|
|
@ -5406,6 +5406,8 @@ self: super: with self; {
|
|||
|
||||
lakeside = callPackage ../development/python-modules/lakeside { };
|
||||
|
||||
langchain = callPackage ../development/python-modules/langchain { };
|
||||
|
||||
langcodes = callPackage ../development/python-modules/langcodes { };
|
||||
|
||||
langdetect = callPackage ../development/python-modules/langdetect { };
|
||||
|
|
@ -6910,6 +6912,8 @@ self: super: with self; {
|
|||
|
||||
openant = callPackage ../development/python-modules/openant { };
|
||||
|
||||
openapi-schema-pydantic = callPackage ../development/python-modules/openapi-schema-pydantic { };
|
||||
|
||||
openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { };
|
||||
|
||||
openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue