mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 17:14:00 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a0cb562430
@ -28,7 +28,7 @@ It does so in a clean environment (using `env --ignore-environment`), and it che
|
||||
|
||||
The variables that this phase control are:
|
||||
|
||||
- `dontVersionCheck`: Disable adding this hook to the [`preDistPhases`](#var-stdenv-preDist). Useful if you do want to load the bash functions of the hook, but run them differently.
|
||||
- `dontVersionCheck`: Disable adding this hook to the [`preInstallCheckHooks`](#ssec-installCheck-phase). Useful if you do want to load the bash functions of the hook, but run them differently.
|
||||
- `versionCheckProgram`: The full path to the program that should print the `${version}` string. Defaults roughly to `${placeholder "out"}/bin/${pname}`. Using `$out` in the value of this variable won't work, as environment variables from this variable are not expanded by the hook. Hence using `placeholder` is unavoidable.
|
||||
- `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`.
|
||||
- `preVersionCheck`: A hook to run before the check is done.
|
||||
|
||||
@ -79,7 +79,7 @@ Besides tests provided by upstream, that you run in the [`checkPhase`](#ssec-che
|
||||
|
||||
- They access the package as consumers would, independently from the environment in which it was built
|
||||
- They can be run and debugged without rebuilding the package, which is useful if that takes a long time
|
||||
- They don't add overhead to each build, as opposed checks added to the [`distPhase`](#ssec-distribution-phase), such as [`versionCheckHook`](#versioncheckhook).
|
||||
- They don't add overhead to each build, as opposed checks added to the [`installCheckPhase`](#ssec-installCheck-phase), such as [`versionCheckHook`](#versioncheckhook).
|
||||
|
||||
It is also possible to use `passthru.tests` to test the version with [`testVersion`](#tester-testVersion), but since that is pretty trivial and recommended thing to do, we recommend using [`versionCheckHook`](#versioncheckhook) for that, which has the following advantages over `passthru.tests`:
|
||||
|
||||
|
||||
@ -13736,6 +13736,13 @@
|
||||
github = "mi-ael";
|
||||
githubId = 12199265;
|
||||
};
|
||||
miampf = {
|
||||
email = "miampf@proton.me";
|
||||
github = "miampf";
|
||||
githubId = 111570799;
|
||||
name = "Mia Motte Mallon";
|
||||
keys = [ { fingerprint = "7008 92AA 6F32 8CAC 8740 0070 EF03 9364 B5B6 886C"; } ];
|
||||
};
|
||||
miangraham = {
|
||||
github = "miangraham";
|
||||
githubId = 704580;
|
||||
|
||||
@ -3,11 +3,11 @@ let
|
||||
client = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.croc ];
|
||||
};
|
||||
pass = pkgs.writeText "pass" "PassRelay";
|
||||
pass = "PassRelay";
|
||||
in {
|
||||
name = "croc";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ hax404 julm ];
|
||||
maintainers = [ equirosa SuperSandro2000 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
@ -38,12 +38,12 @@ in {
|
||||
sender.execute("echo Hello World > testfile01.txt")
|
||||
sender.execute("echo Hello Earth > testfile02.txt")
|
||||
sender.execute(
|
||||
"croc --pass ${pass} --relay relay send --code topSecret testfile01.txt testfile02.txt >&2 &"
|
||||
"env CROC_SECRET=topSecret croc --pass ${pass} --relay relay send testfile01.txt testfile02.txt >&2 &"
|
||||
)
|
||||
|
||||
# receive the testfiles and check them
|
||||
receiver.succeed(
|
||||
"croc --pass ${pass} --yes --relay relay topSecret"
|
||||
"env CROC_SECRET=topSecret croc --pass ${pass} --yes --relay relay"
|
||||
)
|
||||
assert "Hello World" in receiver.succeed("cat testfile01.txt")
|
||||
assert "Hello Earth" in receiver.succeed("cat testfile02.txt")
|
||||
|
||||
@ -34,24 +34,16 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
version = "27.1";
|
||||
version = "28.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
# hash retrieved from signed SHA256SUMS
|
||||
sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da";
|
||||
sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upnp: fix build with miniupnpc 2.2.8
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
|
||||
hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook pkg-config installShellFiles ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
, CoreServices
|
||||
, desktopToDarwinBundle
|
||||
, useKeytar ? true
|
||||
# command line arguments which are always set
|
||||
, commandLineArgs ? ""
|
||||
}:
|
||||
|
||||
let
|
||||
@ -106,7 +108,8 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -45,14 +45,14 @@ let
|
||||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.39.95";
|
||||
x86_64-darwin-sha256 = "1bvafqnh60ps5dba473l6zpm6hw7qcmpj55mxm6amakvkp63d92s";
|
||||
x86_64-darwin-version = "4.40.128";
|
||||
x86_64-darwin-sha256 = "0hfgl2pfarnd9gh921rfz9s9kkvyf8fmmhgb6j87jgbwf8rjrjmm";
|
||||
|
||||
x86_64-linux-version = "4.39.95";
|
||||
x86_64-linux-sha256 = "06d4mnvk3fj57laygf08nlh970wb4jvq1kycv27h1bq6bq365b6n";
|
||||
x86_64-linux-version = "4.40.128";
|
||||
x86_64-linux-sha256 = "1p7ybwrsfy5iq5ggpz1p4mx58ilwzsvn7k149i5ifi0zifahwwdg";
|
||||
|
||||
aarch64-darwin-version = "4.39.95";
|
||||
aarch64-darwin-sha256 = "0kmbf9nd6ccng8a9qb02i2n2mcrjk45cqphx0k7drwd4nyn6zzmy";
|
||||
aarch64-darwin-version = "4.40.128";
|
||||
aarch64-darwin-sha256 = "0h6659lny80kxrqaf9qidirkw702wi7hjwwdhk9y0gcy87s9rqwd";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
||||
@ -93,5 +93,8 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ Anton-Latukha kashw2 ];
|
||||
mainProgram =
|
||||
"qbittorrent"
|
||||
+ lib.optionalString (!guiSupport) "-nox";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,6 +8,9 @@
|
||||
mkAzExtension,
|
||||
mycli,
|
||||
python3Packages,
|
||||
autoPatchelfHook,
|
||||
python3,
|
||||
openssl_1_1,
|
||||
}:
|
||||
|
||||
{
|
||||
@ -58,6 +61,26 @@
|
||||
meta.maintainers = with lib.maintainers; [ mikut ];
|
||||
};
|
||||
|
||||
confcom = mkAzExtension rec {
|
||||
pname = "confcom";
|
||||
version = "1.0.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
|
||||
sha256 = "73823e10958a114b4aca84c330b4debcc650c4635e74c568679b6c32c356411d";
|
||||
description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ openssl_1_1 ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyyaml
|
||||
deepdiff
|
||||
docker
|
||||
tqdm
|
||||
];
|
||||
postInstall = ''
|
||||
chmod +x $out/${python3.sitePackages}/azext_confcom/bin/genpolicy-linux
|
||||
'';
|
||||
meta.maintainers = with lib.maintainers; [ miampf ];
|
||||
};
|
||||
|
||||
containerapp = mkAzExtension rec {
|
||||
pname = "containerapp";
|
||||
version = "1.0.0b1";
|
||||
|
||||
64
pkgs/by-name/ba/baddns/package.nix
Normal file
64
pkgs/by-name/ba/baddns/package.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "baddns";
|
||||
version = "1.1.869";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blacklanternsecurity";
|
||||
repo = "baddns";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BoRR7duvkXjI8vVP59IOACuIV7NmQe1loMEUgPfsdNw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
colorama
|
||||
dnspython
|
||||
httpx
|
||||
python-dateutil
|
||||
python-whois
|
||||
pyyaml
|
||||
setuptools
|
||||
tldextract
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
mock
|
||||
pyfakefs
|
||||
pytest-asyncio
|
||||
pytest-httpx
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "baddns" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_cli_validation_customnameservers_valid"
|
||||
"test_modules_customnameservers"
|
||||
"test_references_cname_css"
|
||||
"test_references_cname_js"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Tool to check subdomains for subdomain takeovers and other DNS issues";
|
||||
homepage = "https://github.com/blacklanternsecurity/baddns/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "baddns";
|
||||
};
|
||||
}
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.11.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q=";
|
||||
hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA==";
|
||||
hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
{
|
||||
rustPlatform,
|
||||
callPackage,
|
||||
pkg-config,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libayatana-appindicator,
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gg-jj";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gulbanana";
|
||||
repo = "gg";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xOi/AUlH0FeenTXz3hsDYixCEl+yr22PGy6Ow4TKxY0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src-tauri";
|
||||
|
||||
webui = callPackage ./webui.nix {
|
||||
inherit
|
||||
src
|
||||
pname
|
||||
version
|
||||
meta
|
||||
;
|
||||
};
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk_4_1
|
||||
openssl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cargoHash = "sha256-u3SkRA7327ZwqEnB+Xq2JDbI0k5HfeKzV17dvQ8B6xk=";
|
||||
|
||||
postPatch = ''
|
||||
buildRoot=$(pwd)
|
||||
pushd $cargoDepsCopy/libappindicator-sys
|
||||
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
substituteInPlace src/lib.rs \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
substituteInPlace .cargo-checksum.json \
|
||||
--replace-fail $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
|
||||
popd
|
||||
|
||||
pushd $cargoDepsCopy/jj-cli
|
||||
oldHash=$(sha256sum build.rs | cut -d " " -f 1)
|
||||
substituteInPlace build.rs \
|
||||
--replace-fail 'let path = std::env::var("CARGO_MANIFEST_DIR").unwrap();' "let path = \"$buildRoot\";"
|
||||
substituteInPlace .cargo-checksum.json \
|
||||
--replace-fail $oldHash $(sha256sum build.rs | cut -d " " -f 1)
|
||||
popd
|
||||
|
||||
substituteInPlace ./tauri.conf.json \
|
||||
--replace-fail '"frontendDist": "../dist"' '"frontendDist": "${webui}"' \
|
||||
--replace-fail '"beforeBuildCommand": "npm run build"' '"beforeBuildCommand": ""'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gulbanana/gg";
|
||||
changelog = "https://github.com/gulbanana/gg/releases/tag/v${version}";
|
||||
description = "GUI for jj users";
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
mainProgram = "gg";
|
||||
license = lib.licenses.apsl20;
|
||||
};
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
{
|
||||
version,
|
||||
src,
|
||||
pname,
|
||||
pnpm,
|
||||
meta,
|
||||
buildNpmPackage,
|
||||
}:
|
||||
|
||||
buildNpmPackage {
|
||||
inherit version src meta;
|
||||
pname = "${pname}-webui";
|
||||
|
||||
npmDepsHash = "sha256-oHBFuX65D/FgnGa03jjpIKAdH8Q4c2NrpD64bhfe720=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
@ -16,13 +16,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts-color-emoji";
|
||||
version = "2.042";
|
||||
version = "2.047";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "noto-emoji";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54=";
|
||||
hash = "sha256-v1vLXs8peNF6S7iBLViAWQSW042lwIDqAjB270pRPF0=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nvrh";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikew";
|
||||
repo = "nvrh";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a/TFSS4PeZWEYph4B8qDr4BJPY4CnHafvw07t1ytofo=";
|
||||
hash = "sha256-QM8VVvNTPvu6Yg1G8FW/694RyTbw36AqkvISeP70gpE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svt-av1-psy";
|
||||
version = "2.2.1-A";
|
||||
version = "2.2.1-B";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gianni-rosato";
|
||||
repo = "svt-av1-psy";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-oCs8ZSfiqmAv2go6fa51l/Kt2pb1qdvuHtACRT2xGrw=";
|
||||
hash = "sha256-3GF60XMKglpU82S5XNyW1DBYtU0KVrfghRVYokZTGoI=";
|
||||
};
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
4946
pkgs/by-name/wg/wgpu/Cargo.lock
generated
4946
pkgs/by-name/wg/wgpu/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,65 +0,0 @@
|
||||
{
|
||||
rustPlatform,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
pkg-config,
|
||||
fontconfig,
|
||||
stdenv,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wgpu";
|
||||
version = "22.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gfx-rs";
|
||||
repo = "wgpu";
|
||||
rev = "refs/tags/wgpu-v${version}";
|
||||
hash = "sha256-Gtq0xYZoWNwW+BKVLqVVKGqc+4HjaD7NN1hlzyFP5g0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"noise-0.8.2" = "sha256-7GvShJeSNfwMCBIfqLghXgKQv7EDMqVchJw0uxPhNr4=";
|
||||
"rspirv-0.11.0+sdk-1.2.198" = "sha256-AcJqkcXBr/+SHdUDXd63sQ0h5eosMqRhV4aUREJH8Bw=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
fontconfig
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
CoreServices
|
||||
QuartzCore
|
||||
AppKit
|
||||
]
|
||||
);
|
||||
|
||||
#requires GPU
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://wgpu.rs/";
|
||||
description = "Cross-platform, safe, pure-Rust graphics API.";
|
||||
changelog = "https://github.com/gfx-rs/wgpu/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
apsl20
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -1,37 +1,46 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
, boost }:
|
||||
{
|
||||
lib,
|
||||
boost,
|
||||
fetchFromGitHub,
|
||||
qt5,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
inherit (qt5) qmake wrapQtAppsHook;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zegrapher";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdelKS";
|
||||
repo = "ZeGrapher";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OSQXm0gDI1zM2MBM4iiY43dthJcAZJkprklolsNMEvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://zegrapher.com/";
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://zegrapher.com/en/";
|
||||
description = "Open source math plotter";
|
||||
mainProgram = "ZeGrapher";
|
||||
longDescription = ''
|
||||
An open source, free and easy to use math plotter. It can plot functions,
|
||||
sequences, parametric equations and data on the plane.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "ZeGrapher";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-icon-theme";
|
||||
version = "unstable-2021-07-21";
|
||||
version = "0-unstable-2024-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "m4thewz";
|
||||
repo = "dracula-icons";
|
||||
rev = "2d3c83caa8664e93d956cfa67a0f21418b5cdad8";
|
||||
hash = "sha256-GY+XxTM22jyNq8kaB81zNfHRhfXujArFcyzDa8kjxCQ=";
|
||||
rev = "6232e5217429a3ae6396c9e054f5338cecdbb7a5";
|
||||
hash = "sha256-u2cIUTLWYs8VIqg6ZAUyz0nmzuFAZC4oh7bE67+B1Vg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -48,11 +48,18 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "faiss";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString pythonSupport ''
|
||||
substituteInPlace faiss/python/loader.py \
|
||||
--replace-fail \
|
||||
"# platform-dependent legacy fallback using numpy.distutils.cpuinfo" \
|
||||
"return False"
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[ cmake ]
|
||||
++ lib.optionals cudaSupport [
|
||||
@ -63,7 +70,6 @@ stdenv.mkDerivation {
|
||||
pythonPackages.python
|
||||
pythonPackages.setuptools
|
||||
pythonPackages.pip
|
||||
pythonPackages.wheel
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
packaging,
|
||||
setuptools,
|
||||
pip,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
@ -24,7 +23,6 @@ buildPythonPackage {
|
||||
build-system = [
|
||||
setuptools
|
||||
pip
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "model-bakery";
|
||||
version = "1.19.5";
|
||||
version = "1.20.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "model-bakers";
|
||||
repo = "model_bakery";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hOXE3mddGmRRgO9qAlj3bnmco8QTg2rD0sgui3J9pp8=";
|
||||
hash = "sha256-71c5p6FypqbwUUoYu4dTamYnBlks1fiXTp7dUfc0ZQs=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@ -2,46 +2,47 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
openssh,
|
||||
ps,
|
||||
hatchling,
|
||||
paramiko,
|
||||
psutil,
|
||||
pytest-cov-stub,
|
||||
pytest-mock,
|
||||
pytest-timeout,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plumbum";
|
||||
version = "1.8.3";
|
||||
format = "pyproject";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomerfiliba";
|
||||
repo = "plumbum";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-k2H/FBQAWrCN1P587s/OhiCGNasMKEFJYIBIU808rlE=";
|
||||
hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"--cov-config=setup.cfg", ' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
ssh = [ paramiko ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
openssh
|
||||
ps
|
||||
psutil
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMP
|
||||
@ -63,9 +64,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module Shell Combinators";
|
||||
changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}";
|
||||
description = " Plumbum: Shell Combinators";
|
||||
homepage = " https://github.com/tomerfiliba/plumbum ";
|
||||
homepage = " https://github.com/tomerfiliba/plumbum";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylacus";
|
||||
version = "1.10.0";
|
||||
version = "1.11.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "ail-project";
|
||||
repo = "PyLacus";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HPd/kF79Xb5kyYdOpm6ny6/rRNeu8WkTv7rM1Kpb7YI=";
|
||||
hash = "sha256-kCYpv6rCvjeXlyB+x6AgT9DY9EvccoQKaWpR19ZJhLc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# buildInputs
|
||||
torch,
|
||||
|
||||
# checks
|
||||
# tests
|
||||
cloudpickle,
|
||||
psutil,
|
||||
pytestCheckHook,
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
let
|
||||
pname = "torchmetrics";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -38,7 +38,7 @@ buildPythonPackage {
|
||||
owner = "Lightning-AI";
|
||||
repo = "torchmetrics";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q=";
|
||||
hash = "sha256-527cHPFdFw/JajHe7Kkz7+zl4EfePaLx77I2OTjjxaA=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
# propagated build input
|
||||
faiss,
|
||||
torch,
|
||||
@ -47,18 +48,32 @@
|
||||
openpyxl,
|
||||
requests,
|
||||
xmltodict,
|
||||
pgvector,
|
||||
sqlite-vec,
|
||||
python-multipart,
|
||||
# native check inputs
|
||||
unittestCheckHook,
|
||||
|
||||
pythonAtLeast,
|
||||
pytestCheckHook,
|
||||
# check inputs
|
||||
httpx,
|
||||
msgpack,
|
||||
sqlalchemy,
|
||||
}:
|
||||
let
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
api = [
|
||||
aiohttp
|
||||
fastapi
|
||||
pillow
|
||||
python-multipart
|
||||
uvicorn
|
||||
];
|
||||
ann = [
|
||||
annoy
|
||||
hnswlib
|
||||
pgvector
|
||||
sqlalchemy
|
||||
sqlite-vec
|
||||
];
|
||||
# cloud = [ apache-libcloud ];
|
||||
console = [ rich ];
|
||||
|
||||
@ -124,10 +139,11 @@ let
|
||||
requests
|
||||
xmltodict
|
||||
];
|
||||
all = api ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow;
|
||||
all = api ++ ann ++ console ++ database ++ graph ++ model ++ pipeline ++ similarity ++ workflow;
|
||||
|
||||
optional-dependencies = {
|
||||
inherit
|
||||
ann
|
||||
api
|
||||
console
|
||||
database
|
||||
@ -147,7 +163,8 @@ in
|
||||
buildPythonPackage {
|
||||
pname = "txtai";
|
||||
inherit version;
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -155,16 +172,17 @@ buildPythonPackage {
|
||||
owner = "neuml";
|
||||
repo = "txtai";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tnM6ye0Sxh8P2bm3awE72GvXEY0gXX1Sv+wPr77wRGU=";
|
||||
hash = "sha256-DQB12mFUMsKJ8cACowI1Vc7k2n1npdTOQknRmHd5EIM=";
|
||||
};
|
||||
|
||||
buildTools = [ setuptools ];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# We call it faiss, not faiss-cpu.
|
||||
"faiss-cpu"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
faiss
|
||||
torch
|
||||
transformers
|
||||
@ -176,23 +194,52 @@ buildPythonPackage {
|
||||
|
||||
optional-dependencies = optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "txtai" ];
|
||||
|
||||
# some tests hang forever
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
export TRANSFORMERS_CACHE=$(mktemp -d)
|
||||
# The Python imports check runs huggingface-hub which needs a writable directory.
|
||||
# `pythonImportsCheck` runs in the installPhase (before checkPhase).
|
||||
preInstall = ''
|
||||
export HF_HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
] ++ optional-dependencies.api ++ optional-dependencies.similarity;
|
||||
pythonImportsCheck = [ "txtai" ];
|
||||
|
||||
unittestFlagsArray = [
|
||||
"-s"
|
||||
"test/python"
|
||||
"-v"
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ optional-dependencies.ann ++ optional-dependencies.api ++ optional-dependencies.similarity;
|
||||
|
||||
checkInputs = [
|
||||
httpx
|
||||
msgpack
|
||||
python-multipart
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
# The deselected paths depend on the huggingface hub and should be run as a passthru test
|
||||
# disabledTestPaths won't work as the problem is with the classes containing the tests
|
||||
# (in other words, it fails on __init__)
|
||||
pytestFlagsArray = [
|
||||
"test/python/test*.py"
|
||||
"--deselect=test/python/testcloud.py"
|
||||
"--deselect=test/python/testconsole.py"
|
||||
"--deselect=test/python/testembeddings.py"
|
||||
"--deselect=test/python/testgraph.py"
|
||||
"--deselect=test/python/testapi/testembeddings.py"
|
||||
"--deselect=test/python/testapi/testpipelines.py"
|
||||
"--deselect=test/python/testapi/testworkflow.py"
|
||||
"--deselect=test/python/testdatabase/testclient.py"
|
||||
"--deselect=test/python/testdatabase/testduckdb.py"
|
||||
"--deselect=test/python/testdatabase/testencoder.py"
|
||||
"--deselect=test/python/testworkflow.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Hardcoded paths
|
||||
"testInvalidTar"
|
||||
"testInvalidZip"
|
||||
# Downloads from Huggingface
|
||||
"testPipeline"
|
||||
# Not finding sqlite-vec despite being supplied
|
||||
"testSQLite"
|
||||
"testSQLiteCustom"
|
||||
];
|
||||
|
||||
meta = {
|
||||
@ -201,7 +248,5 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/neuml/txtai";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
# This should be addressed in a newer version, but we first need to wait for python311Packages.faiss to be updated
|
||||
broken = pythonAtLeast "3.12";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "3.2.0";
|
||||
version = "3.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7bCfIWJV7gB+WbvMxmhJW1RM1pd3gA/bCuH+o4FGg/A=";
|
||||
hash = "sha256-Ebk2oa4mv48pSzOyDxOddltIiyXpUZ+mt+VkDpbW1LM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@ -37,13 +37,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prl-tools";
|
||||
version = "20.0.1-55659";
|
||||
version = "20.1.0-55732";
|
||||
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-5h8WZB7L6D9KOgIPSstN1sNcf3FZQiOQFB5MUC4YzvA=";
|
||||
hash = "sha256-WKYsLcr7m6VAjYZu4BNxaarI7x/a7onlalQpV/Qws0w=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
|
||||
14
pkgs/os-specific/linux/prl-tools/update.sh
Normal file → Executable file
14
pkgs/os-specific/linux/prl-tools/update.sh
Normal file → Executable file
@ -12,13 +12,12 @@ kb_url="https://kb.parallels.com/en/130212"
|
||||
content="$(curl -s "$kb_url")"
|
||||
|
||||
# Match latest version from Parallels knowledge base
|
||||
regex='<meta property="og:description" content="[^"]*Parallels Desktop ([0-9]+) for Mac ([0-9]+\.[0-9]+\.[0-9+]) \(([0-9]+)\)[^"]*" />'
|
||||
regex='<meta property="og:description" content="[^"]*Parallels Desktop[\ 0-9]*for Mac ([0-9]+\.[0-9]+\.[0-9+]) \(([0-9]+)\)[^"]*" />'
|
||||
if [[ $content =~ $regex ]]; then
|
||||
major_version="${BASH_REMATCH[1]}"
|
||||
version="${BASH_REMATCH[2]}-${BASH_REMATCH[3]}"
|
||||
echo "Found latest version: $version, major version: $major_version"
|
||||
version="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}"
|
||||
echo "Found latest version: $version"
|
||||
else
|
||||
echo "Failed to extract version from $kb_url"
|
||||
echo "Failed to extract version from $kb_url" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -30,10 +29,11 @@ if [[ "$old_version" > "$version" || "$old_version" == "$version" ]]; then
|
||||
fi
|
||||
|
||||
# Update version and hash
|
||||
major_version=$(echo $version | cut -d. -f1)
|
||||
dmg_url="https://download.parallels.com/desktop/v${major_version}/${version}/ParallelsDesktop-${version}.dmg"
|
||||
sha256="$(nix store prefetch-file $dmg_url --json | jq -r '.hash')"
|
||||
sed -i -e "s/version = \"$old_version\"/version = \"$version\"/" \
|
||||
-e "s/hash = \"sha256-.*\"/hash = \"$sha256\"/" "$path"
|
||||
sed -i -e "s,version = \"$old_version\",version = \"$version\"," \
|
||||
-e "s,hash = \"sha256-.*\",hash = \"$sha256\"," "$path"
|
||||
|
||||
git commit -qm "linuxPackages_latest.prl-tools: $old_version -> $version" "$path"
|
||||
echo "Updated linuxPackages_latest.prl-tools $old_version -> $version"
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.56.1";
|
||||
version = "0.56.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gVRmSWcWTO1HZ6K2N1sSZchSq2xMc60W+ImHU0xEnA0=";
|
||||
hash = "sha256-wqiFUiNZ3VG4c/QkoliU2BtqanyC4GwlwUZomOX3VrU=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "16.0.0";
|
||||
version = "16.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topgrade-rs";
|
||||
repo = "topgrade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MYilhVUaf5+gsRNv3tJm5UL8mH2T49r8jLPkd4vHRTw=";
|
||||
hash = "sha256-/zSr6PEtfzLI/c32KrBlfHPja34T5DyiiR5a1/GDH/0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RP86Wk4rsM6MBH6zAiZ5JqQhkm0HCEMFrUj9ULqB978=";
|
||||
cargoHash = "sha256-ANmVdT0irhD3d6E4yNBOWqex3ApdfWgmQHxhGKsI4jA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "10.0.11";
|
||||
version = "10.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vW67Q/11BPRHkDA1m99+PdxQUoylMt2sx6gZFEzgSNY=";
|
||||
hash = "sha256-GrdJAXHdkJYB+k2RexcCWhIhxY9UNY9IVJbzlLKDcKA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eejDwlovkGLENvNywtFPmqKcwqr+HB+oURL/sDfhOuA=";
|
||||
vendorHash = "sha256-gTSc2mDNt7K954GXxUjjxPR0NkZwSTCjQDQ9x57ookw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -38,7 +38,7 @@ buildGoModule rec {
|
||||
'';
|
||||
homepage = "https://github.com/schollz/croc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ equirosa SuperSandro2000 ];
|
||||
mainProgram = "croc";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-eval-jobs";
|
||||
version = "2.24.0";
|
||||
version = "2.24.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=";
|
||||
hash = "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=";
|
||||
};
|
||||
buildInputs = [
|
||||
boost
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "coercer";
|
||||
version = "2.4.3";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p0dalirius";
|
||||
@ -15,22 +16,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
pythonRelaxDeps = [ "impacket" ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"impacket"
|
||||
];
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
impacket
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"coercer"
|
||||
];
|
||||
pythonImportsCheck = [ "coercer" ];
|
||||
|
||||
# this file runs into issues on case-insensitive filesystems
|
||||
# ValueError: Both <...>/coercer and <...>/coercer.py exist
|
||||
@ -40,9 +35,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to automatically coerce a Windows server";
|
||||
mainProgram = "coercer";
|
||||
homepage = "https://github.com/p0dalirius/Coercer";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
changelog = "https://github.com/p0dalirius/Coercer/releases/tag/${version}";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "coercer";
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.82.6";
|
||||
version = "3.82.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zJVP7uXmGvpI8pyhNiK70iMy+RW+UwenDpXBe98VbMo=";
|
||||
hash = "sha256-loGM/ivmkAslDr3QQvsZ5UyHfpFtK6iZHqx5rzmhEzA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-69APqkjBNs6FUCeHm6lF8QqAuu76pLdam2LJJrx3WXg=";
|
||||
vendorHash = "sha256-JllOihg7JiKmfxSjXnQeM2/nNXEyAPv7+73PLDFJNZ4=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -36340,8 +36340,6 @@ with pkgs;
|
||||
fftw = fftwSinglePrec;
|
||||
});
|
||||
|
||||
zegrapher = libsForQt5.callPackage ../applications/science/math/zegrapher { };
|
||||
|
||||
### SCIENCE/MEDICINE
|
||||
|
||||
dcmtk = callPackage ../applications/science/medicine/dcmtk { };
|
||||
@ -38113,7 +38111,9 @@ with pkgs;
|
||||
|
||||
tusk = callPackage ../applications/office/tusk { };
|
||||
|
||||
trufflehog = callPackage ../tools/security/trufflehog { };
|
||||
trufflehog = callPackage ../tools/security/trufflehog {
|
||||
buildGoModule = buildGo123Module;
|
||||
};
|
||||
|
||||
tunnelx = callPackage ../applications/gis/tunnelx { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user