mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 09:14:28 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
798dfbbedb
@ -155,6 +155,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable).
|
||||
|
||||
- [intel-gpu-tools](https://drm.pages.freedesktop.org/igt-gpu-tools), tools for development and testing of the Intel DRM driver. Available as [hardware.intel-gpu-tools](#opt-hardware.intel-gpu-tools.enable)
|
||||
|
||||
- [Pretix](https://pretix.eu/about/en/), an open source ticketing software for events. Available as [services.pretix](#opt-services.pretix.enable).
|
||||
|
||||
- [microsocks](https://github.com/rofl0r/microsocks), a tiny, portable SOCKS5 server with very moderate resource usage. Available as [services.microsocks](#opt-services.microsocks.enable).
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
[Startup]
|
||||
sync_effects_enabled = ${toPyBoolStr cfg.syncEffectsEnabled}
|
||||
devices_off_on_screensaver = ${toPyBoolStr cfg.devicesOffOnScreensaver}
|
||||
battery_notifier = ${toPyBoolStr (cfg.mouseBatteryNotifier || cfg.batteryNotifier.enable)}
|
||||
battery_notifier = ${toPyBoolStr cfg.batteryNotifier.enable}
|
||||
battery_notifier_freq = ${builtins.toString cfg.batteryNotifier.frequency}
|
||||
battery_notifier_percent = ${builtins.toString cfg.batteryNotifier.percentage}
|
||||
|
||||
@ -80,14 +80,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
mouseBatteryNotifier = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Mouse battery notifier.
|
||||
'';
|
||||
};
|
||||
|
||||
batteryNotifier = mkOption {
|
||||
description = ''
|
||||
Settings for device battery notifications.
|
||||
@ -143,14 +135,11 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = flatten [
|
||||
(optional cfg.mouseBatteryNotifier ''
|
||||
The option openrazer.mouseBatteryNotifier is deprecated.
|
||||
Please use openrazer.batteryNotifier instead to enable and configure battery notifications.
|
||||
'')
|
||||
];
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "hardware" "openrazer" "mouseBatteryNotifier" ] [ "hardware" "openrazer" "batteryNotifier" "enable" ])
|
||||
];
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
boot.extraModulePackages = [ kernelPackages.openrazer ];
|
||||
boot.kernelModules = drivers;
|
||||
|
||||
|
||||
25
nixos/modules/hardware/video/intel-gpu-tools.nix
Normal file
25
nixos/modules/hardware/video/intel-gpu-tools.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.hardware.intel-gpu-tools;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
hardware.intel-gpu-tools = {
|
||||
enable = lib.mkEnableOption "a setcap wrapper for intel-gpu-tools";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
security.wrappers.intel_gpu_top = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = "${pkgs.intel-gpu-tools}/bin/intel_gpu_top";
|
||||
capabilities = "cap_perfmon+ep";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
@ -107,6 +107,7 @@
|
||||
./hardware/video/bumblebee.nix
|
||||
./hardware/video/capture/mwprocapture.nix
|
||||
./hardware/video/displaylink.nix
|
||||
./hardware/video/intel-gpu-tools.nix
|
||||
./hardware/video/nvidia.nix
|
||||
./hardware/video/switcheroo-control.nix
|
||||
./hardware/video/uvcvideo/default.nix
|
||||
|
||||
@ -1477,8 +1477,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.20.0";
|
||||
hash = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E=";
|
||||
version = "0.21.0";
|
||||
hash = "sha256-enx5qlbvfn25jGkjJEB0dJ3/zGhlVC5Q3ISS1qL9+bg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
||||
@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "craftos-pc";
|
||||
publisher = "jackmacwindows";
|
||||
version = "1.2.2";
|
||||
hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE=";
|
||||
version = "1.2.3";
|
||||
hash = "sha256-QoLMefSmownw9AEem0jx1+BF1bcolHYpiqyPKQNkdiQ=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "r";
|
||||
publisher = "reditorsupport";
|
||||
version = "2.8.2";
|
||||
hash = "sha256-FPL/JjW452KRchcQ0iHXRJarZXvS3B8PvZhXjf3rMhQ=";
|
||||
version = "2.8.3";
|
||||
hash = "sha256-3HVBBXMdRhnKLnhrbEQFIlIbB/rbj+AAb4/z3/Ch7eg=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@ -21,19 +21,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diebahn";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "railway";
|
||||
rev = version;
|
||||
hash = "sha256-2iLxErEP0OG+BcG7fvJBzNjh95EkNoC3NC7rKxPLhYk=";
|
||||
hash = "sha256-Oj+y3BFAVzWUt+S0iOtKzFBiJGOGHuTj41FHHuOrWh8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${src}";
|
||||
inherit src;
|
||||
hash = "sha256-TyafdFWCaZgLEW2yVfm9+9kXRKoiyCAbRndcb7XCVdI=";
|
||||
hash = "sha256-//tr1CLn5Qoc+XMFzwNIvmsQD4SrjNRTX3hUPqlhwNs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Travel with all your train information in one place";
|
||||
description = "Travel with all your train information in one place. Also known as Railway.";
|
||||
homepage = "https://gitlab.com/schmiddi-on-mobile/railway";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "diebahn";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E5/7qAK2pvl1ADioF7Iwe9SgCE6tVaQdtOAwNo3XZx8=";
|
||||
hash = "sha256-7Gmb28/k72wfd2bWDCk7onUBAzNs6b5q52lCn0WB3B8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5VTC6Y3Bs2ViW5/O8TeD0i6Boeu71b9C+B/3O73bCbk=";
|
||||
vendorHash = "sha256-uYClwaFSj03K4YD/jvn67sIko72jDqd5Fv2zoCXZZbw=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -11,18 +11,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-533GGzSlpF9Rz8SrV0x6Hea/H8WxujuPF3cwmL5vdCw=";
|
||||
hash = "sha256-QwbxGym0eesCzrT//1+Hcr15B4nFck5u1VNRU8xE3Qo=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorHash = "sha256-F3di9oTuE7qWzvAbHMkrSG+hkEs7FpEo4tLX6dCdklY=";
|
||||
vendorHash = "sha256-JlfQRYdmxghGrKGwrn8jK1m32EhskmhMiyxNHZma0N0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, nixosTests
|
||||
, config
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
# To expose the *srht modules, they have to be a python module so we use `buildPythonModule`
|
||||
@ -64,6 +65,13 @@ let
|
||||
inherit version;
|
||||
hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM=";
|
||||
};
|
||||
# Fixes a test failure with Pytest 8
|
||||
patches = (oldAttrs.patches or []) ++ [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pallets/werkzeug/commit/4e5bdca7f8227d10cae828f8064fb98190ace4aa.patch";
|
||||
hash = "sha256-H45/YF9zaOUg6UqEEus4uBeGA/TjynuJZcRyc6BHQ30=";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
# sourcehut is not (yet) compatible with factory-boy 3.x
|
||||
|
||||
@ -9,12 +9,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "disko";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "disko";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=";
|
||||
hash = "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ bash ];
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fzf";
|
||||
version = "0.51.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf";
|
||||
rev = version;
|
||||
hash = "sha256-ybg2Zq2J/3lyIFnQpnPbRe6D8iD+hgiiA02EatOQVkI=";
|
||||
hash = "sha256-RchZ798pUwQy8reHeJYrk4P09KVUwhVaDArvtpGV/1Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ho2jVD/U/2BFt3BF5w+KHp5nSVmukx0o2l3ISDGDSt0=";
|
||||
vendorHash = "sha256-Kc/bYzakx9c/bF42LYyE1t8JCUqBsJQFtczrFocx/Ps=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "greenmask";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreenmaskIO";
|
||||
repo = "greenmask";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RotNZnmOYZfrukg0OPGnxCf0nbspqUdSJ53P9cmFlOA=";
|
||||
hash = "sha256-d3VMq0sW5WEmSWssOknWQ+tmG8N1w4KYKl1QT4R9SRY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WCsZ5DU+mZk9M1lldBY4q2PXI8DDFytPojzGJ6wqXsg=";
|
||||
|
||||
@ -49,9 +49,9 @@ rustPlatform.buildRustPackage rec {
|
||||
sqlite
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
darwin.apple_sdk_11_0.frameworks.CoreFoundation
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
darwin.apple_sdk_11_0.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
env = {
|
||||
|
||||
@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvas-scanner";
|
||||
version = "23.1.0";
|
||||
version = "23.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "openvas-scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2tMCyEBVR/DQP7Dny5iPypv2IWkurfxhZEHC/f+Pe8c=";
|
||||
hash = "sha256-jk7wjI+pruwYAuqlMVq+M68CM1y10a7DzmFkQrOIUkg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "retool";
|
||||
version = "2.3.7";
|
||||
version = "2.3.8";
|
||||
|
||||
pyproject = true;
|
||||
disabled = python3.pkgs.pythonOlder "3.10";
|
||||
@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "unexpectedpanda";
|
||||
repo = "retool";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WEx/S6+8lJXu+4yKazzJ55HTGKr38GMRL242FV7KdLQ=";
|
||||
hash = "sha256-KGBpGZAC0SjStp0aulxVRJMmNwlpvSG0i0rtZgvFCpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
buildGo122Module rec {
|
||||
pname = "seabird";
|
||||
version = "0.2.2";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getseabird";
|
||||
repo = "seabird";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wrZLWDTgcUS8snCqc5rInqitAkrsStL8zmc8vjl4ApQ=";
|
||||
hash = "sha256-MZEgzTwaBNXLimSj/vXR624DCJ7i2W5lYUdVxqvFii0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-z9l6g5NkAErRQo8oiqwKG9ssm8K2S+eSZBD0w4kO3kc=";
|
||||
vendorHash = "sha256-g7qKI78VeDUu8yafrk2llCIirW/1uxfx6urVLRexsPE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "templ";
|
||||
version = "0.2.663";
|
||||
version = "0.2.680";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "a-h";
|
||||
repo = "templ";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TU8QG6OmUzSNDAX9W0Ntmz5cucLqVQeTskfnJbm/YM0=";
|
||||
hash = "sha256-n5OSbVc+UhN0WeWzG1Lop5oX5Zc/hlp/aaBoFjpua64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM=";
|
||||
vendorHash = "sha256-zYW2dM+g9RfiOrNjhIsfszy3yqTcAKzGbDPpQh5TP6E=";
|
||||
|
||||
subPackages = [ "cmd/templ" ];
|
||||
|
||||
|
||||
@ -30,12 +30,12 @@ in
|
||||
{ });
|
||||
julia_110-bin = wrapJulia (callPackage
|
||||
(import ./generic-bin.nix {
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
sha256 = {
|
||||
x86_64-linux = "51bccc9bb245197f24e6b2394e6aa69c0dc1e41b4e300b796e17da34ef64db1e";
|
||||
aarch64-linux = "f319ff2812bece0918cb9ea6e0df54cc9412fc5ef8c0589b6a4fea485c07535d";
|
||||
x86_64-darwin = "52679b9285b9aa8354afade8cc5a6c98d30af31ee72e4e879d17cef5dd4d4213";
|
||||
aarch64-darwin = "c7392237725b54d2d145bf56ce362e502596ea4338523a91bf20ce02379cea80";
|
||||
x86_64-linux = "81b910c922fff0e27ae1f256f2cc803db81f3960215281eddd2d484721928c70";
|
||||
aarch64-linux = "2d52a61826872b3170c65f99a954bd9d21a31211cb50948056d924f811a0024f";
|
||||
x86_64-darwin = "af61600db0abdc56fffb1b47cd18c30213b8925796546b53b657e164126082b4";
|
||||
aarch64-darwin = "9ea32daa1bef34c8e48d6c76187f48fd2bf1054cc921fb8c374b737b51c9ffdd";
|
||||
};
|
||||
})
|
||||
{ });
|
||||
@ -50,8 +50,8 @@ in
|
||||
{ });
|
||||
julia_110 = wrapJulia (callPackage
|
||||
(import ./generic.nix {
|
||||
version = "1.10.2";
|
||||
hash = "sha256-YkaHIK+8QQ608mLtJDOpITJieHLJ9pC3BNwEXMsVVAE=";
|
||||
version = "1.10.3";
|
||||
hash = "sha256-2JKyEjvmTaz50F5My61/F5f2v4fDl6dIBLARyHUPbI8=";
|
||||
patches = [
|
||||
./patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch
|
||||
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin";
|
||||
version = "1.9.23";
|
||||
version = "1.9.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "125yb2yzah7laf38m78pysvcd5a16b129a06rckrpylsmcx7s4wk";
|
||||
sha256 = "sha256-63to4BAp+me8jQYO5UwSAY8sYN3EOM8h2xRRcimqaTs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "25.3.2.11";
|
||||
sha256 = "sha256-GeYDTgUcU//KjEw8jX/zR5OagHQLqpYLitn1PVmcIi0=";
|
||||
version = "25.3.2.12";
|
||||
sha256 = "sha256-ZqyJtKr0QdzuuzKnJ/S6Z4cGLWolVMVWcMuAHyOGzkQ=";
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,21 +8,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustpython";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustPython";
|
||||
repo = "RustPython";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8tDzgsmKLjsfMT5j5HqrQ93LsGHxmC2DJu5KbR3FNXc=";
|
||||
hash = "sha256-AtIaWwE1pEIP1SJN9dYgHRP1GX4LTmetIPztHbsBXto=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rustpython-ast-0.3.0" = "sha256-5IR/G6Y9OE0+gTvU1iTob0TxfiV3O9elA/0BUy2GA8g=";
|
||||
"rustpython-ast-0.3.1" = "sha256-dT0x4E8k/FcSP/q0uwwBWniT1n9HGmFF/HV6hAE6bGU=";
|
||||
"rustpython-doc-0.3.0" = "sha256-34ERuLFKzUD9Xmf1zlafe42GLWZfUlw17ejf/NN6yH4=";
|
||||
"unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
blasIntSize = if blas64 then "64" else "32";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blis";
|
||||
version = "0.9.0";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flame";
|
||||
repo = "blis";
|
||||
rev = version;
|
||||
sha256 = "sha256-1aHIdt5wCDrT1hBPnaUVThwjwDkJQ0G0+tao2iFXYpM=";
|
||||
sha256 = "sha256-lAo6C34QQvXr3LmcsnTp4+Imi/lKxzcWu3EJkVgLvDI=";
|
||||
};
|
||||
|
||||
inherit blas64;
|
||||
|
||||
@ -1,23 +1,25 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPerlPackage
|
||||
, exiftool
|
||||
, fetchurl
|
||||
, gitUpdater
|
||||
, shortenPerlShebang
|
||||
, testers
|
||||
{
|
||||
buildPerlPackage,
|
||||
exiftool,
|
||||
fetchurl,
|
||||
gitUpdater,
|
||||
lib,
|
||||
shortenPerlShebang,
|
||||
stdenv,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildPerlPackage rec {
|
||||
pname = "Image-ExifTool";
|
||||
version = "12.82";
|
||||
version = "12.84";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
|
||||
hash = "sha256-1MfWz0AR+SaM2Ar7gAfLs38OJhOnP4cRekpe1uSjDD4=";
|
||||
hash = "sha256-sfSnx5bS7vI0KIhBOpB5VYzP6g8oi0rR7mUTxxNWEA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/exiftool
|
||||
'';
|
||||
@ -28,9 +30,7 @@ buildPerlPackage rec {
|
||||
command = "${lib.getExe exiftool} -ver";
|
||||
package = exiftool;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
url = "https://github.com/exiftool/exiftool.git";
|
||||
};
|
||||
updateScript = gitUpdater { url = "https://github.com/exiftool/exiftool.git"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "ailment";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3JPoO9GpnVEc4UQhhXxpj53PwK5eRsy6Ikt4qw5jGa8=";
|
||||
hash = "sha256-xHxWP16XbVcsT+UIyouqyhbnxPBNx7oH1unBhJU44fI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, aiomisc
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pytest
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
{
|
||||
lib,
|
||||
aiomisc,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
pytest,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc-pytest";
|
||||
version = "1.1.2";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,29 +19,20 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "aiomisc_pytest";
|
||||
inherit version;
|
||||
hash = "sha256-Zja0cNFrn6mUFlZOtzAtBJ/Gn27akD59qX6p88ytD6w=";
|
||||
hash = "sha256-4mWP77R3CoX+XhoT6BbxQtxpINpdmeozjYUsegNfMyU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pytest"
|
||||
];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
pythonRelaxDeps = [ "pytest" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiomisc
|
||||
];
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiomisc_pytest"
|
||||
];
|
||||
dependencies = [ aiomisc ];
|
||||
|
||||
pythonImportsCheck = [ "aiomisc_pytest" ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "angr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-btj1bGpS/t1uQxmMiZ+PTBqiIb7eigg1vGTPjzr4/p4=";
|
||||
hash = "sha256-NZO4aQQfp+P9nbVr+cFd5Z2Ziz9cYzuLUi6nVY+Czr0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "capstone" ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "archinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-58iijDVs4OqZytHDjhGqYRMSIVGPCWTUNRy74OQZcPw=";
|
||||
hash = "sha256-aZwU/i1tBT6M5+PNR77vYzPKklWERXhvG1kknwC0RQQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
{ lib
|
||||
, bluetooth-data-tools
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, sensor-state-data
|
||||
{
|
||||
lib,
|
||||
bluetooth-data-tools,
|
||||
bluetooth-sensor-state-data,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
sensor-state-data,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,14 +23,17 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "bthome-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eaRFHrISxYovQLtNUPrgNw3ATClHqpZ+Us+JGmNNbyY=";
|
||||
hash = "sha256-umRPB0eUdFL4kIvqSfbw/Jzh7NZMY6WR4dK+1cyK3EI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
bluetooth-data-tools
|
||||
bluetooth-sensor-state-data
|
||||
cryptography
|
||||
@ -37,18 +41,9 @@ buildPythonPackage rec {
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=bthome_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bthome_ble"
|
||||
];
|
||||
pythonImportsCheck = [ "bthome_ble" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for BThome BLE devices";
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "claripy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ecYyoFtCIsrlzcraqL8X4cZgqc243E9WXZix/70eksY=";
|
||||
hash = "sha256-U7aN6MOptGjW61HDfZDM7Vit5G+rm1LujgHoo6oRX3s=";
|
||||
};
|
||||
|
||||
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = "binaries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8uvhjxZOgMjE2csOxS+kUPeo/pswovBDOLp5w8d4JSk=";
|
||||
hash = "sha256-6FVxlQ1MiJP2mtu4V/mPAyaeCRdBp/sk+u4fdFqxTyA=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "cle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cG9j3cMDwjm2DGvvgJgYfigf5e/61HKWFudgezE2zz8=";
|
||||
hash = "sha256-BPKNrFBEKV8UuSdrl+HIgBqFClHTvRsGidz+X81bBLI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "7.3.2";
|
||||
version = "7.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z+QBjMT0L7dqCJvbwok9TWQajIPzmAq3XPLWFxmhPsk=";
|
||||
hash = "sha256-rFxCeQTCQSpg0LQYyOxhk150KOUyV9PXdXo1mOA0KPw=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -1,35 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
packaging,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.29";
|
||||
format = "setuptools";
|
||||
version = "1.5.33";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = pname;
|
||||
repo = "fastcore";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yCPOF150TdkPHfLl8Jo2oow+91IzRKgnXo3eQMn5wK0=";
|
||||
hash = "sha256-Zf6bNHMiYEJrLPU1w7OvEavdKIageG+sJ9W8OE/ET0M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ packaging ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastcore"
|
||||
];
|
||||
pythonImportsCheck = [ "fastcore" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Fast AI";
|
||||
|
||||
@ -229,6 +229,11 @@ buildPythonPackage {
|
||||
!(cudaSupport -> lib.versionAtLeast cudaVersion "11.1")
|
||||
|| !(cudaSupport -> lib.versionAtLeast cudaPackagesGoogle.cudnn.version "8.2")
|
||||
|| !(cudaSupport -> stdenv.isLinux)
|
||||
|| !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}"));
|
||||
|| !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}"))
|
||||
# Fails at pythonImportsCheckPhase:
|
||||
# ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4
|
||||
# /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c
|
||||
# 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))'
|
||||
|| (stdenv.isDarwin && stdenv.isx86_64);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cython,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kasa-crypt";
|
||||
version = "0.4.1";
|
||||
format = "pyproject";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -19,27 +20,23 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = "kasa-crypt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZAynSL6tIQoe9veYGusel9GQEffeLQ8dBA9HfA6TMzI=";
|
||||
hash = "sha256-7PLOuWxA5ziOuysSu+nLWNmNA3/sbuUCuZcMRBflf6U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=kasa_crypt --cov-report=term-missing:skip-covered" ""
|
||||
--replace-fail " --cov=kasa_crypt --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
cython
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kasa_crypt"
|
||||
];
|
||||
pythonImportsCheck = [ "kasa_crypt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast kasa crypt";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linknlink";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "xuanxuan000";
|
||||
repo = "python-linknlink";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G0URNUHIh/td+A8MhIC0mePx2SmhEXhIzOpbVft33+w=";
|
||||
hash = "sha256-kV9NCe0u3Z0J9bg1kko5D9fQvyqWTN7v3cVcNQvO0g0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.35.32";
|
||||
version = "1.36.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vNmhFd1lm1pfni2ZK0DshBC9cDRiSWhXTUHAPh/oGJc=";
|
||||
hash = "sha256-OGu3+E3T8EpKVVqndgmJwTftWcfLbKId/PmVz7dk3x8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_file";
|
||||
inherit version;
|
||||
hash = "sha256-EljAFryO4e/jejsIE4S6R9vKE7ksIF0xVLojX8Ccwvs=";
|
||||
hash = "sha256-8hnCUleaOHKlGtNpRHggmE5XAs2hEXqp6oSo2Cg0dto=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "mkdocstrings";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VKjK58KK9x5RCc7VVy46zax42ySCv2NzqAat+XF+3a8=";
|
||||
hash = "sha256-Z4mX6EXEFmNd/CNa39hN9mwJSv9OkqwEmWMzJ9r+EBM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,41 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, python-jose
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-toolbelt
|
||||
, urllib3
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
deprecation,
|
||||
fetchFromGitHub,
|
||||
jwcrypto,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
requests,
|
||||
requests-toolbelt,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-keycloak";
|
||||
version = "2.6.0";
|
||||
format = "pyproject";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcospereirampj";
|
||||
repo = "python-keycloak";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cuj0gJlZDkbJ2HRSMcQvO4nxpjw65CKGEpWCL5sucvg=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZXS29bND4GsJNhTGiUsLo+4FYd8Tubvg/+PJ33tqovY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Upstream doesn't set version
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.0.0"' 'version = "${version}"' \
|
||||
--replace 'requests-toolbelt = "^0.9.1"' 'requests-toolbelt = "*"'
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-jose
|
||||
urllib3
|
||||
dependencies = [
|
||||
deprecation
|
||||
jwcrypto
|
||||
requests
|
||||
requests-toolbelt
|
||||
];
|
||||
@ -43,13 +42,12 @@ buildPythonPackage rec {
|
||||
# Test fixtures require a running keycloak instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"keycloak"
|
||||
];
|
||||
pythonImportsCheck = [ "keycloak" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides access to the Keycloak API";
|
||||
homepage = "https://github.com/marcospereirampj/python-keycloak";
|
||||
changelog = "https://github.com/marcospereirampj/python-keycloak/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-tado";
|
||||
version = "0.17.5";
|
||||
format = "setuptools";
|
||||
version = "0.17.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
@ -17,23 +19,23 @@ buildPythonPackage rec {
|
||||
owner = "wmalgadey";
|
||||
repo = "PyTado";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FjdqZc4Zt2sLYJpnD/MAzr8Y9lGHteHB5psQqheS84I=";
|
||||
hash = "sha256-KcYxUKQuO7TLS4YPg2mrBjP+DMnvZeJokGzwmeM/CvE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
dependencies = [ requests ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "PyTado" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python binding for Tado web API. Pythonize your central heating!";
|
||||
mainProgram = "pytado";
|
||||
homepage = "https://github.com/wmalgadey/PyTado";
|
||||
changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
mainProgram = "pytado";
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.101";
|
||||
version = "9.2.102";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zI86NYe0b9ppm9Zv6+zfB3UclhIm1TTqcC9vrBn3NR8=";
|
||||
hash = "sha256-P16jsBmFkuzMHcVTvGEK7/SzIkVpFJsUlxFeHCHivig=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1140";
|
||||
version = "3.0.1141";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-af0vBypBXfclCQ3BICh0hBjMCpE9F3PZE/bmk2jx+jI=";
|
||||
hash = "sha256-OMjAQ75ONmEbLZYo+oOyn6tpp4+JlZ+ZDnOA0Vlkoro=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -11,11 +11,12 @@
|
||||
, h5py
|
||||
, pytestCheckHook
|
||||
, stdenv
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensordict";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,17 +25,17 @@ buildPythonPackage rec {
|
||||
owner = "pytorch";
|
||||
repo = "tensordict";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0=";
|
||||
hash = "sha256-wKEzNaaazGEkoElzp93RIlq/r5uRUdM7UyDy/DygIEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
torch
|
||||
wheel
|
||||
which
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cloudpickle
|
||||
numpy
|
||||
torch
|
||||
@ -72,5 +73,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pytorch/tensordict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
# No python 3.12 support yet: https://github.com/pytorch/rl/issues/2035
|
||||
broken = pythonAtLeast "3.12";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,13 +12,22 @@
|
||||
, ale-py
|
||||
, gym
|
||||
, pygame
|
||||
, torchsnapshot
|
||||
, gymnasium
|
||||
, mujoco
|
||||
, h5py
|
||||
, huggingface-hub
|
||||
, minari
|
||||
, pandas
|
||||
, pillow
|
||||
, requests
|
||||
, scikit-learn
|
||||
, torchvision
|
||||
, tqdm
|
||||
, moviepy
|
||||
, git
|
||||
, hydra-core
|
||||
, tensorboard
|
||||
, tqdm
|
||||
, wandb
|
||||
, packaging
|
||||
, tensordict
|
||||
@ -31,7 +40,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchrl";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -40,17 +49,17 @@ buildPythonPackage rec {
|
||||
owner = "pytorch";
|
||||
repo = "rl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lETW996IKPUGgZpe+cyzrXvVmDSwj5G4XFreFmGxReQ=";
|
||||
hash = "sha256-8wSyyErqveP9zZS/UGvWVBYyylu9BuA447GEjXIzBIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
ninja
|
||||
setuptools
|
||||
wheel
|
||||
which
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cloudpickle
|
||||
numpy
|
||||
packaging
|
||||
@ -64,10 +73,24 @@ buildPythonPackage rec {
|
||||
gym
|
||||
pygame
|
||||
];
|
||||
checkpointing = [
|
||||
torchsnapshot
|
||||
];
|
||||
gym-continuous = [
|
||||
gymnasium
|
||||
mujoco
|
||||
];
|
||||
offline-data = [
|
||||
h5py
|
||||
huggingface-hub
|
||||
minari
|
||||
pandas
|
||||
pillow
|
||||
requests
|
||||
scikit-learn
|
||||
torchvision
|
||||
tqdm
|
||||
];
|
||||
rendering = [
|
||||
moviepy
|
||||
];
|
||||
@ -103,6 +126,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
scipy
|
||||
torchvision
|
||||
]
|
||||
++ passthru.optional-dependencies.atari
|
||||
++ passthru.optional-dependencies.gym-continuous
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "4.40.1";
|
||||
version = "4.40.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -63,7 +63,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "transformers";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w9BVJwYS2QV58UTOpcoQwdC+dxZuhLS2h8PqN5W2Yjc=";
|
||||
hash = "sha256-GMoHWJAfQJ3y1DPs9+geNdzD72rwMVEG0GLPYEvbo/E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tfsec";
|
||||
version = "1.28.5";
|
||||
version = "1.28.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "tfsec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zMOAXuMOuWzV5uqzNvw+2DiEA9o/80v7DW5KDhoT/fg=";
|
||||
hash = "sha256-Dc6eXw1qGr2KxRoG3Odfa07s2SYdnxVbJHeVQdETBIs=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -22,7 +23,7 @@ buildGoModule rec {
|
||||
# "-extldflags '-fno-PIC -static'"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-nBjlsDFjkqwFBwNnGk8WC+XM5xBuopyrloPlQyOReuY=";
|
||||
vendorHash = "sha256-RxsoTNj/V1UgcMq7vbjGlkJCMEVyvfmSz2IPncs53hY=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/tfsec"
|
||||
@ -35,6 +36,9 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/aquasecurity/tfsec";
|
||||
changelog = "https://github.com/aquasecurity/tfsec/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab peterromfeldhk ];
|
||||
maintainers = with maintainers; [
|
||||
fab
|
||||
peterromfeldhk
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-go";
|
||||
version = "1.33.0";
|
||||
version = "1.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "protobuf-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hA/UweNQSVzMeauIol73p9yYYCvnLcZNTYMrRWk9dBg=";
|
||||
hash = "sha256-xbfqN/t6q5dFpg1CkxwxAQkUs8obfckMDqytYzuDwF4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";
|
||||
|
||||
@ -17,20 +17,20 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "tauri-v${version}";
|
||||
hash = "sha256-sqBZVCVJkgqCK5JcNcJ6kKxL26XGxOA1uDlOOt/+iDo=";
|
||||
hash = "sha256-TJUE+H2bFuMc6GZHomBC2D89i+SOzIkALlws1sIe3jc=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-g1uDF7lL9dmZY5J8uNDAsA8dG5IVrV7MumN1w+fk1/8=";
|
||||
cargoHash = "sha256-fOXYE0MJfL1r4DDauuELJkCG4tEOCXscyn9kgaMkidY=";
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }:
|
||||
{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, perlPackages, jdk8, jre8 }:
|
||||
|
||||
# To whomever it may concern:
|
||||
#
|
||||
@ -49,7 +49,7 @@ let
|
||||
# The latest Dwarf Fortress version. Maintainers: when a new version comes
|
||||
# out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
|
||||
# this. Note that unfuck and twbt are not required for 50.
|
||||
latestVersion = "50.12";
|
||||
latestVersion = "50.13";
|
||||
|
||||
# Converts a version to a package name.
|
||||
versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}";
|
||||
@ -79,9 +79,7 @@ let
|
||||
|
||||
dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix {
|
||||
inherit dwarf-fortress;
|
||||
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {
|
||||
texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]);
|
||||
}).override (optionalAttrs (!isAtLeast50) {
|
||||
dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist {}).override (optionalAttrs (!isAtLeast50) {
|
||||
# 41.2.5 is the last version to support Dwarf Fortress 0.47.
|
||||
version = "41.2.5";
|
||||
hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs=";
|
||||
|
||||
@ -89,6 +89,11 @@ let
|
||||
hash = "sha256-2mO8DpNmZRCV7IRY0arf3SMvlO4Pxs61Kxfh3q3k3HU=";
|
||||
xmlRev = "980b1af13acc31660dce632f913c968f52e2b275";
|
||||
};
|
||||
"50.13" = {
|
||||
dfHackRelease = "50.13-r1.1";
|
||||
hash = "sha256-FiXanXflszTr4ogz+EoDAUxzE2U9ODeZIJJ1u6Xm4Mo=";
|
||||
xmlRev = "3507715fd07340de5a6c47064220f6e17343e5d5";
|
||||
};
|
||||
};
|
||||
|
||||
release =
|
||||
|
||||
@ -4,10 +4,9 @@
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, cmake
|
||||
, texlive
|
||||
, ninja
|
||||
, version ? "42.1.5"
|
||||
, hash ? "sha256-aUakfUjnIZWNDhCkG3A6u7BaaCG8kPMV/Fu2S73CoDg="
|
||||
, version ? "42.1.6"
|
||||
, hash ? "sha256-VjCXT4sl3HsFILrqTc3JJSeRedZaOXUbf4KvSzTo0uc="
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texlive cmake ninja ];
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ qtbase qtdeclarative ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -144,5 +144,8 @@
|
||||
},
|
||||
"50.12": {
|
||||
"linux": "070014fzwszfgjyxjyij0k0hadah6s62lpi91ykp3vs220azya1m"
|
||||
},
|
||||
"50.13": {
|
||||
"linux": "19wzgsdgv0vq7v2dxhypr9hayky3nm3lbra1kk9vn8ri96jdkfkw"
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,9 +6,6 @@ stdenv.mkDerivation {
|
||||
|
||||
src = looking-glass-client.src;
|
||||
sourceRoot = "${looking-glass-client.src.name}/module";
|
||||
patches = lib.optional (kernel.kernelAtLeast "6.4") [
|
||||
./linux-6-4-compat.patch
|
||||
];
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff --git a/kvmfr.c b/kvmfr.c
|
||||
index 121aae5b..2f4c9e1a 100644
|
||||
--- a/kvmfr.c
|
||||
+++ b/kvmfr.c
|
||||
@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void)
|
||||
if (kvmfr->major < 0)
|
||||
goto out_free;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
|
||||
kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);
|
||||
+#else
|
||||
+ kvmfr->pClass = class_create(KVMFR_DEV_NAME);
|
||||
+#endif
|
||||
if (IS_ERR(kvmfr->pClass))
|
||||
goto out_unreg;
|
||||
|
||||
@ -21,13 +21,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2024-04-28T17-53-50Z";
|
||||
version = "2024-05-01T01-11-10Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
hash = "sha256-PjZYi1JiXQDaQw6z2OCblzCvvT3cOLa80sgFUTHofVY=";
|
||||
hash = "sha256-abx2eYYMU1bWBYHcocTw6uavPLhLlgksG2/eoZWuWOo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pPIcH2I/0792iXLMveZIRSBFKCnvraCyBUutREwTig0=";
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
variants = if stdenv.isLinux then
|
||||
{
|
||||
version = "5.0.24";
|
||||
sha256 = "sha256-6CVQOHN3yFTq6OyVkZMYEjIKfFbQZ6M5KAa3k7qv4Gc=";
|
||||
sha256 = "sha256-SZ62OJD6L3aP6LsTswpuXaayqYbOaSQTgEmV89Si7Xc=";
|
||||
patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ];
|
||||
}
|
||||
else lib.optionalAttrs stdenv.isDarwin
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
version = "6.0.13";
|
||||
sha256 = "sha256-BD3XrTdv4sCa3h37o1A2s3/R0R8zHiR59a4pY0RxLGU=";
|
||||
sha256 = "sha256-z7gzmWRSc4jA9g+WTkKQkWudh3Ef4xcJVgAQ5HzRe/A=";
|
||||
patches = [
|
||||
# Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing
|
||||
./fix-gcc-13-ctype-6_0.patch
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
, boost
|
||||
, gperftools
|
||||
@ -63,8 +63,10 @@ in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
pname = "mongodb";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo";
|
||||
rev = "r${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -127,6 +129,7 @@ in stdenv.mkDerivation rec {
|
||||
"--disable-warnings-as-errors"
|
||||
"VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
|
||||
"--link-model=static"
|
||||
"MONGO_VERSION=${version}"
|
||||
]
|
||||
++ map (lib: "--use-system-${lib}") system-libraries;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pyuehQZVg+f51r/oEH+FIpUUDTCKu4R9DmMaOffRfXA=";
|
||||
hash = "sha256-mwn7oJjVlZli4vhTGui6HCxnjL3Qz8ygejaqvdbZ6co=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HWczvkItE9SVGGQkddnb7/PBkTWrDAdKHjMOztlYV9M=";
|
||||
@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Multi-shell multi-command argument completer";
|
||||
homepage = "https://rsteube.github.io/carapace-bin/";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ mimame ];
|
||||
license = licenses.mit;
|
||||
mainProgram = "carapace";
|
||||
};
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2024.4.8";
|
||||
version = "2024.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bIw7j7KPHlgIucV/onvp92k0OlNgaxqiVq/Cnj0kIuQ=";
|
||||
hash = "sha256-AFJjgNYZ4LDqK0qzYyg/bhqFJZJ9tybzlEaOOppOrdY=";
|
||||
|
||||
# registry is not needed for compilation nor for tests.
|
||||
# contains files with the same name but different case, which cause problems with hash on darwin
|
||||
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yMpU39SU4Ut7vUQdzkBjhf8p8yCU350HMYKGm5CCado=";
|
||||
cargoHash = "sha256-p3rWrNrgIBgF70cwZB+ofDF8Px0t92Vk74exze7ANus=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
1348
pkgs/tools/misc/vector/Cargo.lock
generated
1348
pkgs/tools/misc/vector/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -37,7 +37,7 @@
|
||||
|
||||
let
|
||||
pname = "vector";
|
||||
version = "0.37.1";
|
||||
version = "0.38.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "vectordotdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wRXwgy+UY2z5fIWpQbDxRti54GE357WMGWXM/xKjz18=";
|
||||
hash = "sha256-sJgryN6/XaM1qXxv76/5RGanUpBYxIsGYGToOCXDvwA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
let
|
||||
pname = "ockam";
|
||||
version = "0.122.0";
|
||||
version = "0.124.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "build-trust";
|
||||
repo = pname;
|
||||
rev = "ockam_v${version}";
|
||||
hash = "sha256-0iFY9T+44V3hT21OLGeao2dyEbyNWrQdLAFhMe8QD5o=";
|
||||
hash = "sha256-ovcZD9D/iVF3iIti+vQ29YIJE+UI64BeuA2huJsAx5s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yctLLRX6ZHIA19cfQhnbvcveMq2HVyTBrG8aRbr5HXw=";
|
||||
cargoHash = "sha256-z+GIFN5Q3LWnT5PrZ291G2lHgd5mzDFkKwdcxUXvUnU=";
|
||||
nativeBuildInputs = [ git pkg-config ];
|
||||
buildInputs = [ openssl dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Security ];
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "11.2.0";
|
||||
version = "11.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KjF1tVeASK+psbcf/ND+SRCXYJog74O3Qm2yRGLN6LI=";
|
||||
hash = "sha256-Xq5kOyIKCfTkzyQQQf/krgcKi78JInAFT5oNgjOlINo=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-HKqUBtr6qidBx4SoiWkCdwri3dCrxXMPMSb/X7h+WBs=";
|
||||
vendorHash = "sha256-a0TjKpoS2NwvYeJhb2YIxX5XI/HdKjYPnZkfTKII/DY=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@ -1,21 +1,33 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knowsmore";
|
||||
version = "0.1.37";
|
||||
format = "setuptools";
|
||||
version = "0.1.38";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helviojunior";
|
||||
repo = "knowsmore";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UxBoWK3L4u9xSQaGGHpzvs/mRlmhF3EqiS/4BYyTKos=";
|
||||
hash = "sha256-A68JuzlWvq3OAtgq6uAFcTTYKmL7xjKWZ0HQfVXKt4k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDeps = [
|
||||
"neo4j"
|
||||
"urllib3"
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [ "bs4" ];
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
aioconsole
|
||||
ansi2image
|
||||
beautifulsoup4
|
||||
@ -33,24 +45,18 @@ python3.pkgs.buildPythonApplication rec {
|
||||
xmltodict
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"knowsmore"
|
||||
];
|
||||
pythonImportsCheck = [ "knowsmore" ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/tests*"
|
||||
];
|
||||
pytestFlagsArray = [ "tests/tests*" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for pentesting Microsoft Active Directory";
|
||||
mainProgram = "knowsmore";
|
||||
homepage = "https://github.com/helviojunior/knowsmore";
|
||||
changelog = "https://github.com/helviojunior/knowsmore/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "knowsmore";
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, lvm2
|
||||
, pkg-config
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -17,19 +18,23 @@ buildGoModule rec {
|
||||
hash = "sha256-buEahr6lr+C/99ANAgYdexPX76ECW6yGMes8u2GZKh4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eAqF0ohZGryRh4u+j/30BObYP23yyrTecPrt+xmn9Sg=";
|
||||
vendorHash = "sha256-JY64fqzNBpo9Jwo8sWsWTVVAO5zzwxwXy0A2bgqJHuU=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
btrfs-progs
|
||||
lvm2
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/cli";
|
||||
|
||||
CGO_ENABLED = "0";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@ -93,8 +93,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# i know this is ugly, but it's the cleanest way i found to tell the DesktopVideoHelper where to find its own library
|
||||
appendRunpaths = [ "$ORIGIN/../lib" ];
|
||||
# need to tell the DesktopVideoHelper where to find its own library
|
||||
appendRunpaths = [ "${placeholder "out"}/lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2rtc";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexxIT";
|
||||
repo = "go2rtc";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jKWZHrsESfav8tfQ4rNzvdjUo17DB+kG5qW1CMRbqAM=";
|
||||
hash = "sha256-Qy8XWKhjnaSYsQWLyLgukYeKio5ngzJCO2qS9CzSV1Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iHszhdCeeeMVH3460rVJw2LsEIZRg3KKG8A9Uzcfg3w=";
|
||||
vendorHash = "sha256-5c3oauklMD9fEnVGPyWq6hR5jz6pSnq2kmdq+0JBfpo=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user