Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
080ddac139
@ -6590,6 +6590,13 @@
|
||||
githubId = 195032;
|
||||
name = "Eric Evenchick";
|
||||
};
|
||||
eveeifyeve = {
|
||||
name = "Eveeifyeve";
|
||||
github = "eveeifyeve";
|
||||
githubId = 88671402;
|
||||
matrix = "@eveeifyeve:matrix.org";
|
||||
email = "eveeg1971@gmail.com";
|
||||
};
|
||||
evenbrenden = {
|
||||
email = "packages@anythingexternal.com";
|
||||
github = "evenbrenden";
|
||||
|
||||
@ -58,6 +58,7 @@ in {
|
||||
];
|
||||
|
||||
qt.enable = true;
|
||||
programs.xwayland.enable = true;
|
||||
environment.systemPackages = with kdePackages; let
|
||||
requiredPackages = [
|
||||
qtwayland # Hack? To make everything run on Wayland
|
||||
@ -87,7 +88,6 @@ in {
|
||||
|
||||
# Core Plasma parts
|
||||
kwin
|
||||
pkgs.xwayland
|
||||
kscreen
|
||||
libkscreen
|
||||
kscreenlocker
|
||||
|
||||
@ -10,14 +10,14 @@ let
|
||||
after = ["network.target"];
|
||||
wants = ["network.target"];
|
||||
preStart = ''
|
||||
${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout
|
||||
${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout" +
|
||||
ExecStart = "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" +
|
||||
lib.optionalString cfg.debug " -xx";
|
||||
ExecReload = [
|
||||
"${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout"
|
||||
"${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout"
|
||||
"${pkgs.coreutils}/bin/kill -HUP $MAINPID"
|
||||
];
|
||||
User = "radius";
|
||||
@ -32,6 +32,8 @@ let
|
||||
freeradiusConfig = {
|
||||
enable = lib.mkEnableOption "the freeradius server";
|
||||
|
||||
package = lib.mkPackageOption pkgs "freeradius" { };
|
||||
|
||||
configDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = "/etc/raddb";
|
||||
@ -72,7 +74,9 @@ in
|
||||
/*uid = config.ids.uids.radius;*/
|
||||
description = "Radius daemon user";
|
||||
isSystemUser = true;
|
||||
groups = "radius";
|
||||
};
|
||||
groups.radius = {};
|
||||
};
|
||||
|
||||
systemd.services.freeradius = freeradiusService cfg;
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2024.2.1.7"; # "Android Studio Ladybug | 2024.2.1 Beta 2"
|
||||
sha256Hash = "sha256-YNUtRsKwXHfb7McJmTTT39/wW1rHjzw4kFQRwa12kJE=";
|
||||
version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1"
|
||||
sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4"
|
||||
|
||||
@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter";
|
||||
publisher = "ms-toolsai";
|
||||
version = "2024.8.1";
|
||||
hash = "sha256-eFInKB1xwVVJFIsXHxsuRJeLKTe3Cb8svquHJOW0P+I=";
|
||||
version = "2024.9.0";
|
||||
hash = "sha256-44L7K8JGpmKmH3aoNCalse8QRKJ/2wvA76gs0Z18zpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -297,21 +297,21 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "744f5d9c8b976a431dcb5417a520c0c709b17fbe",
|
||||
"hash": "sha256-ENkG4H2PiZFHRBbX5GRN/kCFTCZDzbJAV5CplThqaEE="
|
||||
"rev": "e226068f979cd8fbfc3be9780d16cfb1405095b0",
|
||||
"hash": "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM="
|
||||
},
|
||||
"version": "unstable-2024-07-20"
|
||||
"version": "unstable-2024-09-23"
|
||||
},
|
||||
"flycast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "38de2868a09a015186d692eb01d5fd89308c8128",
|
||||
"hash": "sha256-eC2BH/3c+2/kktWtYiq6MeI2I5bAkOfwOsTSjkPNqlg=",
|
||||
"rev": "343021a8c507f4723b3f56a3bb817206912fcb36",
|
||||
"hash": "sha256-DMbhCHW2VHEle0oihaz1GEPOGDCXxfdZoL8MdPZT4d0=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-09-16"
|
||||
"version": "unstable-2024-09-27"
|
||||
},
|
||||
"fmsx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -348,20 +348,20 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "gambatte-libretro",
|
||||
"rev": "f775ef92c93c495432bbd51d854568c686ec711b",
|
||||
"hash": "sha256-0WnrCN1F8S+Zy4Mxygm+cc1cSVc6Q91a+VVv7EbmgjA="
|
||||
"rev": "e9a1941276e932813dc742796ffd1d0939c5d1d5",
|
||||
"hash": "sha256-4FFYocOa2fuBT8UFKM87Fn5E6pjkfe4tUVDtpEchtJo="
|
||||
},
|
||||
"version": "unstable-2024-09-06"
|
||||
"version": "unstable-2024-09-27"
|
||||
},
|
||||
"genesis-plus-gx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "1eb04313cdd1d4d79e166d9f3e75c4b3223b142c",
|
||||
"hash": "sha256-lAMVsw0NBFPrG3CRsj6IGKDrVUhH2vDUuAzl2rEEhdk="
|
||||
"rev": "7de0f0b6cde9bda1235b448aa607044b3f80ab3c",
|
||||
"hash": "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM="
|
||||
},
|
||||
"version": "unstable-2024-09-15"
|
||||
"version": "unstable-2024-09-18"
|
||||
},
|
||||
"gpsp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -1,20 +1,24 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
let
|
||||
version = "0.2.67";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "act";
|
||||
version = "0.2.66";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
repo = "act";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-84ssbd0qF0p2x+cFYwYNW4P79KSZqhvF4Zd6wlRhgLo=";
|
||||
hash = "sha256-yNa6o35YUP8D8K3kQLHQOG3V9mWGoxNvYgw5UQOqAtc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fzGnswfzvKhzs7iYnsiQb1c+TTk9+113uj7ryOAvUJk=";
|
||||
vendorHash = "sha256-bkOLortxztmzAO/KCbQC4YsZ5iAero1yxblCkDZg8Ds=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -24,12 +28,15 @@ buildGoModule rec {
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Run your GitHub Actions locally";
|
||||
mainProgram = "act";
|
||||
homepage = "https://github.com/nektos/act";
|
||||
changelog = "https://github.com/nektos/act/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne kashw2 ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
Br1ght0ne
|
||||
kashw2
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
|
||||
let
|
||||
pname = "firefly-iii";
|
||||
version = "6.1.19";
|
||||
version = "6.1.20";
|
||||
phpPackage = php83;
|
||||
npmDepsHash = "sha256-/oz0raI0/AV5NamvMWxlUdiQbVsSKHRplsw2/KrMOwg=";
|
||||
npmDepsHash = "sha256-N4o7FKdya6bGakNKNq2QUV8HKRfuov5ahvbjR/rsimU=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "firefly-iii";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SIvYRmCCzQI+qUr5aA78NQLLmO+EPO1ZEL7vcqJ5puw=";
|
||||
hash = "sha256-vb9pGupa4cRy/p9iHJT7SMNchRQSU9Nnh6FphEcvt+k=";
|
||||
};
|
||||
in
|
||||
|
||||
@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
|
||||
vendorHash = "sha256-qps/dWubCVqqvzgSizJJvx2MUzRZKiMeQCnWz08Ft+E=";
|
||||
vendorHash = "sha256-d5WwrVOVG9ZRZEsG2iKcbp2fk27laHvcJPJUwY3YgDg=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.80.2";
|
||||
version = "0.81.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q3KixUjyiPMLxoBIafyAUOeYRK6fhqgc150bLdwEk7M=";
|
||||
hash = "sha256-iFPUvqdYjSlrGlDrrb0w1HNeU5iAQ7PD4ojeZT3pHZ8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@ -8,30 +8,21 @@
|
||||
, openssl
|
||||
, stdenv
|
||||
, curl
|
||||
, versionCheckHook
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hurl";
|
||||
version = "4.3.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orange-OpenSource";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gSkiNwRR47CZ1YjVa5o8EByCzWBAYPfsMRXydTwFwp0=";
|
||||
repo = "hurl";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+GmIKxD5wHovhKXuV2IbDX43gbD8OxJzWvH3Z0MwwV4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dY00xcMnOCWhdRzC+3mTHSIqeYEPUDBJeYd/GiLM/38=";
|
||||
|
||||
patches = [
|
||||
# Fix for rust 1.79, see https://github.com/Orange-OpenSource/hurl/issues/3057
|
||||
# We should be able to remove this at the next hurl version bump
|
||||
(fetchpatch {
|
||||
name = "hurl-fix-rust-1.79";
|
||||
url = "https://github.com/Orange-OpenSource/hurl/commit/d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch";
|
||||
hash = "sha256-peA4Zq5J8ynL7trvydQ3ZqyHpJWrRmJeFeMKH9XT2n4=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-exAEJhHm7zTzXykkLyz46C0GJ7/7HYEwdfCd8zUDZ/A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -45,8 +36,11 @@ rustPlatform.buildRustPackage rec {
|
||||
curl
|
||||
];
|
||||
|
||||
# Tests require network access to a test server
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
# The actual tests require network access to a test server, but we can run an install check
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1
|
||||
|
||||
@ -69,13 +69,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3772";
|
||||
version = "3829";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-gJFCFhppaXs/9GReEjEZiU/BZ51pjl7IBsUN04uTls0=";
|
||||
hash = "sha256-ZveUZ3/aCLC/m9YugnKWpPp6S6wQXkHfVkUkXhJIKAg=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@ -40,13 +40,13 @@ assert builtins.elem acceleration [
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YYrNrlXL6ytLfnrvSHybi0va0lvgVNuIRP+IFE5XZX8=";
|
||||
hash = "sha256-K1FYXEP0bTZa8M+V4/SxI+Q+LWs2rsAMZ/ETJCaO7P8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,23 +1,29 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, php
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
php,
|
||||
phpunit,
|
||||
testers,
|
||||
}:
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.3.1";
|
||||
version = "11.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-uTH5LlXabhsu86Te/oNnIrvq88MhAqYbVTyKEaPtTuU=";
|
||||
hash = "sha256-bJdatRBrORR7KPcpRVIPYo2picQSfh8Pa0waeOZAH8Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cOy5kipPr73LbxmQAsqqR0GfegQp1ARrbqei2zi5JHc=";
|
||||
vendorHash = "sha256-wRgYEwbvvEGCp7/Rat+WUkvv04JqFHssHXtJjeQZo3o=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = phpunit; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "5.0.20",
|
||||
"version": "5.0.21",
|
||||
"darwin-amd64": {
|
||||
"hash": "sha256-KFkJDzfs5+CsxuHc5y/wEygzAGQDMyAYXOvlNqzSvUQ=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_darwin_all.tar.gz"
|
||||
"hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz"
|
||||
},
|
||||
"darwin-arm64": {
|
||||
"hash": "sha256-KFkJDzfs5+CsxuHc5y/wEygzAGQDMyAYXOvlNqzSvUQ=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_darwin_all.tar.gz"
|
||||
"hash": "sha256-NtouEhpSzfMxna2A91cdPybvqDM11xf7CCroJYSmZYk=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_darwin_all.tar.gz"
|
||||
},
|
||||
"linux-amd64": {
|
||||
"hash": "sha256-oPcy1yvAMTalr+FBynK0cq5Dgc1se/Tf1FZiwCqawIs=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_linux_amd64.tar.gz"
|
||||
"hash": "sha256-O6systY+fRhyDu/clXfuQB6lv2HgzoIe2ku4MwgrQoI=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_amd64.tar.gz"
|
||||
},
|
||||
"linux-arm64": {
|
||||
"hash": "sha256-U2cM3b3MYHSOpgX6VO1mo90ClYDYy2g4QpiB6vkX6Uc=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.20/platform_5.0.20_linux_arm64.tar.gz"
|
||||
"hash": "sha256-tGUXrq96zSEp5VHXeaQdmZdUera/NrMOQxTT8CznJlA=",
|
||||
"url": "https://github.com/platformsh/cli/releases/download/5.0.21/platform_5.0.21_linux_arm64.tar.gz"
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "pupdate";
|
||||
version = "3.15.0";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattpannella";
|
||||
repo = "pupdate";
|
||||
rev = "${version}";
|
||||
hash = "sha256-oe5Z9psxyPhxwrGVJpq5yXzmCUh3ugBQ4NQ/eoCD9AA=";
|
||||
hash = "sha256-GTdca47Jp/q1IpX1IAMZgOgHjBPNSotFSL9O6bfTfnM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {
|
||||
version = "8.1.29";
|
||||
hash = "sha256-h6YDEyY/L1M/GA5xknLKXkfNmITU7DyTcgGY6v+uCCc=";
|
||||
version = "8.1.30";
|
||||
hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4=";
|
||||
extraPatches = [
|
||||
# Fix build with libxml2 2.12+.
|
||||
# Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.23";
|
||||
hash = "sha256-98kM2no8HeAfO/t7Rp1S3snrovO4MyCDYAT5wu7K4ms=";
|
||||
version = "8.2.24";
|
||||
hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.3.11";
|
||||
hash = "sha256-ZkDiRVCAqJrcQdTle7BPjCv7fuxif+GZr5c7/zTX8O4=";
|
||||
version = "8.3.12";
|
||||
hash = "sha256-gHYzSWzNs3CokFRY24K9ZzZumKbVlyiRS3l7h+nK7L8=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
hatchling,
|
||||
pydantic,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
@ -11,19 +11,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "camel-converter";
|
||||
version = "3.1.2";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanders41";
|
||||
repo = "camel-converter";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CJbflRI3wfUmPoVuLwZDYcobESmySvnS99PdpSDhDLk=";
|
||||
hash = "sha256-JdONlMTBnZ2QMcsr+GXmfQzxaFOndmG77qbBa9A3m+k=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
pydantic = [ pydantic ];
|
||||
@ -42,10 +42,10 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for the Meilisearch API";
|
||||
description = "Module to convert strings from snake case to camel case or camel case to snake case";
|
||||
homepage = "https://github.com/sanders41/camel-converter";
|
||||
changelog = "https://github.com/sanders41/camel-converter/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "icontract";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "Parquery";
|
||||
repo = "icontract";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+0h3Zb7lTxtaWTv2/MmvQCcccUKhTOxGqbqKELE8mQY=";
|
||||
hash = "sha256-7mRQ1g2mllHIaZh0jEd/iCgaDja1KJXuRnamhDo/Pbo=";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -10,17 +10,24 @@
|
||||
|
||||
# dependencies
|
||||
async-timeout,
|
||||
asgi-logger,
|
||||
cloudevents,
|
||||
fastapi,
|
||||
grpcio,
|
||||
httpx,
|
||||
azure-identity,
|
||||
kubernetes,
|
||||
numpy,
|
||||
orjson,
|
||||
pandas,
|
||||
prometheus-client,
|
||||
protobuf,
|
||||
requests,
|
||||
psutil,
|
||||
azure-storage-blob,
|
||||
azure-storage-file-share,
|
||||
boto3,
|
||||
google-cloud-storage,
|
||||
pydantic,
|
||||
python-dateutil,
|
||||
pyyaml,
|
||||
@ -32,11 +39,6 @@
|
||||
|
||||
# checks
|
||||
avro,
|
||||
azure-storage-blob,
|
||||
azure-storage-file-share,
|
||||
boto3,
|
||||
botocore,
|
||||
google-cloud-storage,
|
||||
grpcio-testing,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
@ -59,6 +61,16 @@ buildPythonPackage rec {
|
||||
|
||||
sourceRoot = "${src.name}/python/kserve";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"fastapi"
|
||||
"httpx"
|
||||
"prometheus-client"
|
||||
"protobuf"
|
||||
"ray"
|
||||
"uvicorn"
|
||||
"psutil"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
deprecation
|
||||
poetry-core
|
||||
@ -87,30 +99,28 @@ buildPythonPackage rec {
|
||||
uvicorn
|
||||
] ++ ray.optional-dependencies.serve-deps;
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"fastapi"
|
||||
"httpx"
|
||||
"prometheus-client"
|
||||
"protobuf"
|
||||
"ray"
|
||||
"uvicorn"
|
||||
"psutil"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "kserve" ];
|
||||
optional-dependencies = {
|
||||
storage = [
|
||||
azure-identity
|
||||
azure-storage-blob
|
||||
azure-storage-file-share
|
||||
boto3
|
||||
google-cloud-storage
|
||||
requests
|
||||
];
|
||||
logging = [ asgi-logger ];
|
||||
ray = [ ray ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
avro
|
||||
azure-storage-blob
|
||||
azure-storage-file-share
|
||||
boto3
|
||||
botocore
|
||||
google-cloud-storage
|
||||
grpcio-testing
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
tomlkit
|
||||
];
|
||||
] ++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "kserve" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Looks for a config file at the root of the repository
|
||||
@ -122,6 +132,8 @@ buildPythonPackage rec {
|
||||
"test_health_handler"
|
||||
"test_infer"
|
||||
"test_infer_v2"
|
||||
# Assertion error due to HTTP response code
|
||||
"test_unload"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
55
pkgs/development/python-modules/macholib/default.nix
Normal file
55
pkgs/development/python-modules/macholib/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
unittestCheckHook,
|
||||
altgraph,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
pyinstaller,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "macholib";
|
||||
version = "1.16.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ronaldoussoren";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bTql10Ceny4fBCxnEWz1m1wi03EWMDW9u99IQiWYbnY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
altgraph
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit pyinstaller; # Requires macholib for darwin
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$out/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analyze and edit Mach-O headers, the executable format used by Mac OS X.";
|
||||
homepage = "https://github.com/ronaldoussoren/macholib";
|
||||
changelog = "https://github.com/ronaldoussoren/macholib/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ eveeifyeve ];
|
||||
};
|
||||
}
|
||||
@ -366,8 +366,8 @@ rec {
|
||||
"sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g=";
|
||||
|
||||
mypy-boto3-customer-profiles =
|
||||
buildMypyBoto3Package "customer-profiles" "1.35.0"
|
||||
"sha256-j+L/GV/1l1OGQk1T6X4ieErbTkfAhHUl+zSTiSoo/QE=";
|
||||
buildMypyBoto3Package "customer-profiles" "1.35.29"
|
||||
"sha256-RBT3HkjCx8HpPIn/CMLiW1zA29B1F1skhxnfxYzfMNM=";
|
||||
|
||||
mypy-boto3-databrew =
|
||||
buildMypyBoto3Package "databrew" "1.35.0"
|
||||
@ -770,8 +770,8 @@ rec {
|
||||
"sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU=";
|
||||
|
||||
mypy-boto3-lambda =
|
||||
buildMypyBoto3Package "lambda" "1.35.23"
|
||||
"sha256-I70ebuqU7cWYu+rAWqaUbNNiXdq9JZL/dm8++OiJxao=";
|
||||
buildMypyBoto3Package "lambda" "1.35.28"
|
||||
"sha256-hHPXHug6yoAJ0xflfNIJSjVeyQx8U2zyblLbcbL3Uos=";
|
||||
|
||||
mypy-boto3-lex-models =
|
||||
buildMypyBoto3Package "lex-models" "1.35.0"
|
||||
@ -986,8 +986,8 @@ rec {
|
||||
"sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";
|
||||
|
||||
mypy-boto3-organizations =
|
||||
buildMypyBoto3Package "organizations" "1.35.20"
|
||||
"sha256-SqZDiV8VrLmcdW+cO7LjCFipeJtPlL04uXx58UDgsg0=";
|
||||
buildMypyBoto3Package "organizations" "1.35.28"
|
||||
"sha256-lT/74MV0ZKA1rBoHOuZBM0uAf4/aOQ2V5AMxzGY5RFM=";
|
||||
|
||||
mypy-boto3-osis =
|
||||
buildMypyBoto3Package "osis" "1.35.0"
|
||||
@ -1074,8 +1074,8 @@ rec {
|
||||
"sha256-mtpp+ro3b7tOrN4TrWr8BjLzaPo264ty8Sng6wtciMs=";
|
||||
|
||||
mypy-boto3-quicksight =
|
||||
buildMypyBoto3Package "quicksight" "1.35.23"
|
||||
"sha256-ljk8uB17CDpGT9TIAncsrZBGbI9UrPAPU3HQ9Cz2zYE=";
|
||||
buildMypyBoto3Package "quicksight" "1.35.29"
|
||||
"sha256-CzKgkJToddpBtTnmVJCc+jbAeAxQVC1h++UMrXjiry0=";
|
||||
|
||||
mypy-boto3-ram =
|
||||
buildMypyBoto3Package "ram" "1.35.0"
|
||||
@ -1090,8 +1090,8 @@ rec {
|
||||
"sha256-I4lTEWslkWlrayRnTG9wZcSdihSEDd51F37a/zdaMY8=";
|
||||
|
||||
mypy-boto3-rds-data =
|
||||
buildMypyBoto3Package "rds-data" "1.35.0"
|
||||
"sha256-yLKWipyD8l1Zyh840Ixp70maQBz/aDcnJEznpGaXt+E=";
|
||||
buildMypyBoto3Package "rds-data" "1.35.28"
|
||||
"sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw=";
|
||||
|
||||
mypy-boto3-redshift =
|
||||
buildMypyBoto3Package "redshift" "1.35.0"
|
||||
@ -1174,8 +1174,8 @@ rec {
|
||||
"sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.35.26"
|
||||
"sha256-mVFsFO7dOxHCkNxbxYUED0OjAabQ1ZuO/3MQiuy/ynQ=";
|
||||
buildMypyBoto3Package "sagemaker" "1.35.28"
|
||||
"sha256-ivB/tQpf+KLEYFAKnMShvntBS0z5mVXYi1KhvCXxYBk=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"
|
||||
@ -1222,8 +1222,8 @@ rec {
|
||||
"sha256-w30YExW6ENhUaHIwTX8mbnRhQpsI5jUHwjzFCMPvQmQ=";
|
||||
|
||||
mypy-boto3-securityhub =
|
||||
buildMypyBoto3Package "securityhub" "1.35.16"
|
||||
"sha256-qDb5EGz/of/glrIKMz5xkPbatIhjRjs9L4tzW0ckJKw=";
|
||||
buildMypyBoto3Package "securityhub" "1.35.29"
|
||||
"sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w=";
|
||||
|
||||
mypy-boto3-securitylake =
|
||||
buildMypyBoto3Package "securitylake" "1.35.0"
|
||||
@ -1254,8 +1254,8 @@ rec {
|
||||
"sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw=";
|
||||
|
||||
mypy-boto3-sesv2 =
|
||||
buildMypyBoto3Package "sesv2" "1.35.0"
|
||||
"sha256-bKrU7HufafU0Elt05TLZrPycs3kxEHdJcKp6iwWB7ek=";
|
||||
buildMypyBoto3Package "sesv2" "1.35.29"
|
||||
"sha256-rGP+LaoeO6lOMr65C274Qx6EbfwqTau9Q/NgmxIppX0=";
|
||||
|
||||
mypy-boto3-shield =
|
||||
buildMypyBoto3Package "shield" "1.35.0"
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyotgw";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "mvn23";
|
||||
repo = "pyotgw";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM=";
|
||||
hash = "sha256-jms7uSeafLxq26E9pyVVXtnW7yYD0OrU4KrXxTXoC4M=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@ -34,6 +34,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "pyotgw" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"connect_timeouterror"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to interact the OpenTherm Gateway";
|
||||
homepage = "https://github.com/mvn23/pyotgw";
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SGfvaYzqJ+OsJ9sGyR3pgCbEkPondhMQMNrE/r/nIY0=";
|
||||
hash = "sha256-kau350L2WCyuxwsmnD85iWte6LIIqprSVe0yNn+BikE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfc8785";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "trailofbits";
|
||||
repo = "rfc8785.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hMH//DpxgNoNLZJ8XL8SikcTfj0w0FvlBMfnPCkqzZ4=";
|
||||
hash = "sha256-0Gze3voFXEhf13DuTuBWDbYPmqHXs0FSRn2NprFWoB8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rns";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "Reticulum";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-O3dxfO8MrTKaYRCBNygZlXKuIA3rjEr8TCtR/vrUYmo=";
|
||||
hash = "sha256-I4H2f49xYw7z1487WYbspztxprIecBV07TiwyK9aX6c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,15 +1,10 @@
|
||||
{
|
||||
runCommand,
|
||||
makeWrapper,
|
||||
makeFontsConf,
|
||||
fontconfig_file,
|
||||
chromium,
|
||||
...
|
||||
}:
|
||||
let
|
||||
fontconfig = makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
};
|
||||
in
|
||||
runCommand "playwright-chromium"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
@ -25,5 +20,5 @@ runCommand "playwright-chromium"
|
||||
# as headless nixos test vms.
|
||||
makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \
|
||||
--set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \
|
||||
--set-default FONTCONFIG_FILE ${fontconfig}
|
||||
--set-default FONTCONFIG_FILE ${fontconfig_file}
|
||||
''
|
||||
|
||||
@ -217,12 +217,15 @@ let
|
||||
meta.platforms = lib.platforms.darwin;
|
||||
};
|
||||
|
||||
browsers-linux =
|
||||
browsers-linux = lib.makeOverridable (
|
||||
{
|
||||
withChromium ? true,
|
||||
withFirefox ? true,
|
||||
withWebkit ? true,
|
||||
withFfmpeg ? true,
|
||||
fontconfig_file ? makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
},
|
||||
}:
|
||||
let
|
||||
browsers =
|
||||
@ -242,14 +245,20 @@ let
|
||||
# TODO check platform for revisionOverrides
|
||||
"${name}-${value.revision}"
|
||||
(
|
||||
callPackage ./${name}.nix {
|
||||
inherit suffix system throwSystem;
|
||||
inherit (value) revision;
|
||||
}
|
||||
callPackage ./${name}.nix (
|
||||
{
|
||||
inherit suffix system throwSystem;
|
||||
inherit (value) revision;
|
||||
}
|
||||
// lib.optionalAttrs (name == "chromium") {
|
||||
inherit fontconfig_file;
|
||||
}
|
||||
)
|
||||
)
|
||||
) browsers
|
||||
)
|
||||
);
|
||||
)
|
||||
);
|
||||
in
|
||||
{
|
||||
playwright-core = playwright-core;
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, withLdap ? true, openldap
|
||||
, withMemcached ? false, libmemcached
|
||||
, withMysql ? false, libmysqlclient
|
||||
, withPostgresql ? false, postgresql
|
||||
, withPcap ? true, libpcap
|
||||
, withRedis ? false, hiredis
|
||||
, withRest ? false, curl
|
||||
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withLdap openldap
|
||||
++ lib.optional withMemcached libmemcached
|
||||
++ lib.optional withMysql libmysqlclient
|
||||
++ lib.optional withPostgresql postgresql
|
||||
++ lib.optional withPcap libpcap
|
||||
++ lib.optional withRedis hiredis
|
||||
++ lib.optional withRest curl
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "11.2.0";
|
||||
version = "11.2.1";
|
||||
|
||||
subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
|
||||
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SthxNf8e8LEV0LSdVR/x6UXOXy+lGAUqHtQd0bQufjY=";
|
||||
hash = "sha256-rMRzrGdTPfGzMtE3xej5dSOjyyEMn66oPjDUWifMjnQ=";
|
||||
};
|
||||
|
||||
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
|
||||
@ -51,16 +51,16 @@ buildGoModule rec {
|
||||
dontFixup = true;
|
||||
outputHashMode = "recursive";
|
||||
outputHash = rec {
|
||||
x86_64-linux = "sha256-Fo6WsgrFTp79wk+nPuUbPklneTvE+/ki0hX3IE8WR94=";
|
||||
x86_64-linux = "sha256-rz/IP6wi4VKWgO8P4Mov3oviwsDe5iBSKamArVR/+T0=";
|
||||
aarch64-linux = x86_64-linux;
|
||||
aarch64-darwin = "sha256-C2zo+ykk5Zr5DDO4AB9wkc8jgn82VY8WlTR3XiqbD/0=";
|
||||
aarch64-darwin = "sha256-9J9wD8nJ4JEUKroxCEBYZytywzjGkGhujdj9FcNe0rM=";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
disallowedRequisites = [ offlineCache ];
|
||||
|
||||
vendorHash = "sha256-Pmh+tSJR7l34Ncr2DexjvbWRxnWLG3rzuz4n8vpPbx0=";
|
||||
vendorHash = "sha256-shQ39N9YxksfzHDgHx3qjLbZfv5D1+sqtpALI0hCK3U=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -10,23 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "static-web-server";
|
||||
version = "2.32.1";
|
||||
version = "2.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "static-web-server";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PkDT6FU6JSIeeKCJeeIjjqZfoo+tGzqyPyWuIiwusQY=";
|
||||
hash = "sha256-WR8fzpeN6zufvakanJBSMtgTpfDRqCyaTfEzE5NqFOA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/static-web-server/static-web-server/pull/466.patch";
|
||||
hash = "sha256-VYSoi6swG4nEFmGKvdEaJ05mJlxaXYsjs8cQai40P4g=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-AasNva4SOTSrvBTrGHX/jOPjcjt3o8KUsFL7e4uhW6M=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.30";
|
||||
version = "1.1.31";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.30.tgz";
|
||||
sha256 = "1jdnjmwwi8ipqrxb43sas46n2hvr2fsccckknqlfzkfv0lkak07q";
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.31.tgz";
|
||||
sha256 = "1gqfrc8jmhf14mylrrpk58b53s3hxs1fkbj245lhpc50xb206gi0";
|
||||
};
|
||||
|
||||
patches = [ ./fix-js-include-paths.patch ];
|
||||
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-1xDex/BIq1P+LbCuZfLRTckAU6RjF4XU73ZpEd1qncA=";
|
||||
hash = "sha256-hE2zoo/94Qpfvv/g7MO8sYhmXjtq5wC5Kvyyg1CqiXk=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.30",
|
||||
"version": "1.1.31",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
@ -38,13 +38,13 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@yetzt/nedb": "1.8.0",
|
||||
"archiver": "7.0.0",
|
||||
"archiver": "7.0.1",
|
||||
"body-parser": "1.20.3",
|
||||
"cbor": "5.2.0",
|
||||
"compression": "1.7.4",
|
||||
"cookie-session": "2.0.0",
|
||||
"express": "4.21.0",
|
||||
"express-handlebars": "5.3.5",
|
||||
"express-handlebars": "7.1.3",
|
||||
"express-ws": "5.0.2",
|
||||
"ipcheck": "0.1.0",
|
||||
"minimist": "1.2.8",
|
||||
@ -78,7 +78,7 @@
|
||||
"compression": "1.7.4",
|
||||
"cookie-session": "2.0.0",
|
||||
"express": "4.21.0",
|
||||
"express-handlebars": "5.3.5",
|
||||
"express-handlebars": "7.1.3",
|
||||
"express-ws": "5.0.2",
|
||||
"ipcheck": "0.1.0",
|
||||
"minimist": "1.2.8",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -117,18 +117,21 @@ in
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
sed -r "s#RUN\+\=\"/bin/input-remapper-control#RUN\+\=\"$out/bin/input-remapper-control#g" -i data/99-input-remapper.rules
|
||||
sed -r "s#ExecStart\=/usr/bin/input-remapper-service#ExecStart\=$out/bin/input-remapper-service#g" -i data/input-remapper.service
|
||||
substituteInPlace data/99-input-remapper.rules \
|
||||
--replace-fail 'RUN+="/bin/input-remapper-control' "RUN+=\"$out/bin/input-remapper-control"
|
||||
substituteInPlace data/input-remapper.service \
|
||||
--replace-fail 'ExecStart=/usr/bin/input-remapper-service' "ExecStart=$out/bin/input-remapper-service"
|
||||
substituteInPlace data/input-remapper-*.desktop \
|
||||
--replace-fail 'Icon=/usr/share/input-remapper/input-remapper.svg' 'Icon=input-remapper.svg'
|
||||
|
||||
chmod +x data/*.desktop
|
||||
|
||||
install -D -t $out/share/applications/ data/*.desktop
|
||||
install -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
|
||||
install -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
|
||||
install -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
|
||||
install -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
|
||||
install -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf
|
||||
install -D -t $out/usr/share/input-remapper/ data/*
|
||||
install -m644 -D -t $out/share/applications/ data/*.desktop
|
||||
install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
|
||||
install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
|
||||
install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
|
||||
install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
|
||||
install -m644 -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf
|
||||
install -m644 -D data/input-remapper.svg $out/share/icons/hicolor/scalable/apps/input-remapper.svg
|
||||
install -m644 -D -t $out/usr/share/input-remapper/ data/*
|
||||
|
||||
# Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones
|
||||
install -m755 -D -t $out/bin/ bin/input-remapper*
|
||||
|
||||
@ -102,11 +102,11 @@ in
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "277";
|
||||
version = "278";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-ZDW9EzoQG5b0dmydKi850rdf0a8UWKFjrk+toxgBicY=";
|
||||
hash = "sha256-42yZ/PkyiL/epqdGLZiteh3rvDiHBhGL04VDysKRLKA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
1
pkgs/tools/networking/toxvpn/bootstrap.json
Normal file
1
pkgs/tools/networking/toxvpn/bootstrap.json
Normal file
File diff suppressed because one or more lines are too long
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "toxvpn";
|
||||
version = "unstable-2019-09-09";
|
||||
version = "unstable-2024-08-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cleverca22";
|
||||
repo = "toxvpn";
|
||||
rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
|
||||
sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb";
|
||||
rev = "c727451eb871b43855b825ff93dc48fa0d3320b6";
|
||||
sha256 = "sha256-UncU0cpoyy9Z0TCChGmaHpyhW9ctz32gU7n3hgpOEwU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
|
||||
@ -28,13 +28,16 @@ stdenv.mkDerivation {
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ];
|
||||
|
||||
postInstall = "$out/bin/toxvpn -h";
|
||||
postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/";
|
||||
|
||||
installCheckPhase = "$out/bin/toxvpn -h";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful tool that allows one to make tunneled point to point connections over Tox";
|
||||
homepage = "https://github.com/cleverca22/toxvpn";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ cleverca22 obadz toonn ];
|
||||
maintainers = with maintainers; [ cleverca22 craigem obadz toonn ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.26"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.27"
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 4ec7d1be72158642c17b18dcb9e66e44c1bb5a5a
|
||||
ref: refs/tags/6.4.26
|
||||
revision: 86efc784b8598197cfb817ad4e4d0eb75fd59063
|
||||
ref: refs/tags/6.4.27
|
||||
specs:
|
||||
metasploit-framework (6.4.26)
|
||||
metasploit-framework (6.4.28)
|
||||
aarch64
|
||||
abbrev
|
||||
actionpack (~> 7.0.0)
|
||||
|
||||
@ -15,13 +15,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.4.26";
|
||||
version = "6.4.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yGpS3wvUjJ4M4OTHcNNa3PQCl884q4vow+2YiM5QQSI=";
|
||||
hash = "sha256-zett+ZUIqjzm4STt3f9oqyz32ViKTwbiZf8Ey72Bztg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -724,12 +724,12 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "4ec7d1be72158642c17b18dcb9e66e44c1bb5a5a";
|
||||
sha256 = "08j1a378i67dqgl8parqrybh5x6wbb9p1iz4w069x36l1ggm4sn8";
|
||||
rev = "86efc784b8598197cfb817ad4e4d0eb75fd59063";
|
||||
sha256 = "1n6fh6ywn17zcpi0ckwab3czfb5bd3zxvv94w7k3rah8jpwnvsyd";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.4.26";
|
||||
version = "6.4.28";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.82.3";
|
||||
version = "3.82.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Kv7IS7kladdTbPPWbgylqPrqSdn4r9USUMm4rnC4H08=";
|
||||
hash = "sha256-zJVP7uXmGvpI8pyhNiK70iMy+RW+UwenDpXBe98VbMo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dRxnxwxQKdFNf6Ng0E2AQDef1zb3RlBH7glczfYKWMQ=";
|
||||
vendorHash = "sha256-69APqkjBNs6FUCeHm6lF8QqAuu76pLdam2LJJrx3WXg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -705,12 +705,6 @@ in {
|
||||
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
|
||||
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
|
||||
})
|
||||
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2") [
|
||||
# Fix test 'bug55639.phpt'
|
||||
(fetchpatch {
|
||||
url = "https://github.com/php/php-src/commit/1b52ecd78ad1a211a4a9db65975df34d2539125b.patch";
|
||||
hash = "sha256-LVk9sfwl5D+rHzyYjfV4pAuhBjSPXj1WjTfnrzBJXhY";
|
||||
})
|
||||
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
|
||||
|
||||
@ -7509,6 +7509,8 @@ self: super: with self; {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
|
||||
};
|
||||
|
||||
macholib = callPackage ../development/python-modules/macholib { };
|
||||
|
||||
macropy = callPackage ../development/python-modules/macropy { };
|
||||
|
||||
maec = callPackage ../development/python-modules/maec { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user