Merge master into staging-next
This commit is contained in:
@@ -6053,13 +6053,6 @@
|
||||
github = "David-Kopczynski";
|
||||
githubId = 53194670;
|
||||
};
|
||||
david-r-cox = {
|
||||
email = "david@integrated-reasoning.com";
|
||||
github = "david-r-cox";
|
||||
githubId = 4259949;
|
||||
name = "David Cox";
|
||||
keys = [ { fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; } ];
|
||||
};
|
||||
david-sawatzke = {
|
||||
email = "d-nix@sawatzke.dev";
|
||||
github = "david-sawatzke";
|
||||
@@ -27259,6 +27252,12 @@
|
||||
githubId = 38566841;
|
||||
name = "Anthony Butt";
|
||||
};
|
||||
toodeluna = {
|
||||
email = "luna@toodeluna.net";
|
||||
github = "toodeluna";
|
||||
githubId = 112084382;
|
||||
name = "Luna Heyman";
|
||||
};
|
||||
toonn = {
|
||||
email = "nixpkgs@toonn.io";
|
||||
matrix = "@toonn:matrix.org";
|
||||
|
||||
@@ -202,6 +202,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
|
||||
|
||||
- `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.
|
||||
|
||||
- The `services.calibre-web` systemd service has been hardened with additional sandboxing restrictions.
|
||||
|
||||
- `services.kanidm` options for server, client and unix were moved under dedicated namespaces.
|
||||
For each component `enableComponent` and `componentSettings` are now `component.enable` and
|
||||
`component.settings`. The unix module now supports using SSH keys from Kanidm via
|
||||
|
||||
@@ -184,6 +184,45 @@ in
|
||||
|
||||
CacheDirectory = "calibre-web";
|
||||
CacheDirectoryMode = "0750";
|
||||
|
||||
NoNewPrivileges = true;
|
||||
ProtectSystem = "strict";
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
PrivateIPC = true;
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
RestrictSUIDSGID = true;
|
||||
ProtectHome = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
RestrictNamespaces = true;
|
||||
RemoveIPC = true;
|
||||
CapabilityBoundingSet = "";
|
||||
AmbientCapabilities = "";
|
||||
ProtectKernelModules = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
"AF_NETLINK"
|
||||
];
|
||||
SystemCallFilter = [
|
||||
"~@obsolete"
|
||||
"~@privileged"
|
||||
"~@raw-io"
|
||||
"~@resources"
|
||||
"~@mount"
|
||||
"~@debug"
|
||||
"~@cpu-emulation"
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) {
|
||||
StateDirectory = cfg.dataDir;
|
||||
|
||||
@@ -23,7 +23,6 @@ in
|
||||
(lib.mkRenamedOptionModuleWith {
|
||||
sinceRelease = 2505;
|
||||
from = [
|
||||
"virtualisation"
|
||||
"vmware"
|
||||
"vmFileName"
|
||||
];
|
||||
@@ -32,19 +31,21 @@ in
|
||||
"fileName"
|
||||
];
|
||||
})
|
||||
|
||||
(lib.modules.mkRenamedOptionModuleWith {
|
||||
sinceRelease = 2605;
|
||||
from = [
|
||||
"vmware"
|
||||
"baseImageSize"
|
||||
];
|
||||
to = [
|
||||
"virtualisation"
|
||||
"diskSize"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
options = {
|
||||
vmware = {
|
||||
baseImageSize = lib.mkOption {
|
||||
type = with lib.types; either (enum [ "auto" ]) int;
|
||||
default = "auto";
|
||||
example = 2048;
|
||||
description = ''
|
||||
The size of the VMWare base image in MiB.
|
||||
'';
|
||||
};
|
||||
vmDerivationName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "nixos-vmware-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
|
||||
@@ -78,7 +79,7 @@ in
|
||||
rm $diskImage
|
||||
'';
|
||||
format = "raw";
|
||||
diskSize = cfg.baseImageSize;
|
||||
diskSize = config.virtualisation.diskSize;
|
||||
partitionTableType = "efi";
|
||||
inherit config lib pkgs;
|
||||
};
|
||||
|
||||
@@ -54,11 +54,11 @@
|
||||
"vendorHash": "sha256-Hvk2jckla1LcMankcdUTct8Kea0OznyxDxTJ+UrJHy0="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-46ymgizu1ita4valeUvbCZcBTGHk9n9alUYkr9TG9iI=",
|
||||
"hash": "sha256-2YR5Ez7T1OhuFAEsNp8IrXcZhepSteLqxYADU9sSP9s=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v3.20.0",
|
||||
"rev": "v3.21.0",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-AO6reoqxDcPAMXKlqjJLGmhsgFrekaQXjMPm9fxhpFA="
|
||||
},
|
||||
@@ -191,13 +191,13 @@
|
||||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"cloudamqp_cloudamqp": {
|
||||
"hash": "sha256-FrK+deN2X98pG42aDsN4WqiJOC4QcGGS58PoLQMnRXo=",
|
||||
"hash": "sha256-tuTfXQUACkFRrwsFixbHge75U4Z9DNnQ4nhnBmxjH+Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.42.1",
|
||||
"rev": "v1.43.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1kuzWw7OhzruRT572pTR3zpE9jPGEuKRdwReWxte3/E="
|
||||
"vendorHash": "sha256-w21DXJoylvysubXItM+wvuwD2RdqzoUKNC9zElTedEo="
|
||||
},
|
||||
"cloudflare_cloudflare": {
|
||||
"hash": "sha256-RuHAVcDK3KPO4I4FG/DodhNiWe63AexTo9IcyTZ360Q=",
|
||||
@@ -274,13 +274,13 @@
|
||||
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
|
||||
},
|
||||
"datadog_datadog": {
|
||||
"hash": "sha256-at4p1fQpfA4F6H85jcvhqsZZTrEicF9//3JzhQSEp3s=",
|
||||
"hash": "sha256-dY588S4nilXX341KIMDoTFUragUvN8h+8TAcDcE8u64=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.89.0",
|
||||
"rev": "v3.90.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-50iJI5K5VdZ4VkiTQ2g4lwEfdjOz7CdRcMhc0NSIeBA="
|
||||
"vendorHash": "sha256-zlSnjvWLm2puee1+vIDpAxwS5hYZS13Bg+uOdK+vzBU="
|
||||
},
|
||||
"datadrivers_nexus": {
|
||||
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
|
||||
@@ -499,13 +499,13 @@
|
||||
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
|
||||
},
|
||||
"hashicorp_aws": {
|
||||
"hash": "sha256-mrb+bxd6B0qzrU7LmlluraN4WQyT+LM0M2uSphkgLb4=",
|
||||
"hash": "sha256-oTYrC0XrzqHL5t/WeJw9V/vq7/G0Ra2De+TiTkmaWxk=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v6.28.0",
|
||||
"rev": "v6.34.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Ce3ay7PGdv97fQQJjb3PHrvecv4g8vJ/HtSUHeUPqtU="
|
||||
"vendorHash": "sha256-ukDTmgzd4aJ2SJ27qofCtagRTWlP9foF/WwrTkmZEI4="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-eJ4GiOkohhbuwsKtvoDlUM933F3Fd3b5HMLG3mjHBvA=",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2026-02-14";
|
||||
version = "0-unstable-2026-02-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "2425228865293425ab9c8a511772e22be6e7f4ee";
|
||||
hash = "sha256-fG9lWG9nsr5piZDQUqC02DL9lkR6Agza/H6/wFHtkes=";
|
||||
rev = "e78819e1ec1d77a93057c6bf8ef0eba0293ed782";
|
||||
hash = "sha256-TH5FOTtnYNzlM1tysCbSO1wNFxyPSg5n9jUmFli5NJw=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "alpaca";
|
||||
version = "9.0.5";
|
||||
version = "9.2.0";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeffser";
|
||||
repo = "Alpaca";
|
||||
tag = version;
|
||||
hash = "sha256-fN4WKYpsgkYIhPLU7Ckcroo2S0lzX5cGN6uvYS4lG50=";
|
||||
hash = "sha256-/FpeizUrO7WSfcOfBkM0IIdu0rc7UvLXXP2y/tunxeo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -87,6 +87,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
gst-python
|
||||
opencv4
|
||||
zstandard
|
||||
pythonPackages.ollama
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
|
||||
|
||||
@@ -153,6 +153,7 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qtwebengine
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
|
||||
|
||||
|
||||
@@ -82,13 +82,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "ansel";
|
||||
version = "0-unstable-2026-02-16";
|
||||
version = "0-unstable-2026-02-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aurelienpierreeng";
|
||||
repo = "ansel";
|
||||
rev = "e6cc53c5631060f50f3af6525dfc9d0336dd4275";
|
||||
hash = "sha256-uSEttpEosEUXKeG7abAl4VSa8erp8d+A7QwFG2Tmz+U=";
|
||||
rev = "c04fba4ff0048acdaac7b98031fa3ebf06f09bdd";
|
||||
hash = "sha256-dWtEk9uweOqZnOXz+y2fc7Hn8d/Ct8PXULIFB8S7Sy0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ansible-doctor";
|
||||
version = "8.2.0";
|
||||
version = "8.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-eKUeQp4hvLqBkHDfclyR5dTt7jjcVMHneqXBPt1N8No=";
|
||||
hash = "sha256-cD5X2UuH8w987bMdl3fNgh79oMERuQwIqIFRT1E506Y=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "1.1.9";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gYLLKejvyQTbDEua51RxxQy1aSUsp8EJrg/7b5xrEBs=";
|
||||
hash = "sha256-vBX1uFYIDOLrws6LQ2lccPxCwNVes8mw2Mx4uXSZhm0=";
|
||||
# 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;
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-Iv9aRb4soepckHl0cQMb3TqHjiNn19QLFCprTunWiO8=";
|
||||
vendorHash = "sha256-9UWCqFSKCrjPUaOypcmkk6TvMZE9xPLPj06fEzduqMY=";
|
||||
|
||||
excludedPackages = [
|
||||
"internal/gen-jsonschema"
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
Remove boost_system component from find_package
|
||||
|
||||
Boost 1.89.0 removed the separate boost_system compiled library.
|
||||
The boost::system headers are still available through the core Boost package.
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -79,7 +79,7 @@ endif ()
|
||||
|
||||
|
||||
find_package (Boost 1.38 REQUIRED
|
||||
- COMPONENTS filesystem iostreams program_options regex system)
|
||||
+ COMPONENTS filesystem iostreams program_options regex)
|
||||
|
||||
include(FetchContent)
|
||||
FetchContent_Declare(
|
||||
@@ -24,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./0001-get-rid-of-fmt-fetchcontent.patch
|
||||
./0002-fix-fmt-name-formatter.patch
|
||||
./0003-fix-fmt-type-formatter.patch
|
||||
./0004-remove-boost-system-component.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,19 +2,25 @@
|
||||
lib,
|
||||
fetchCrate,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "b3sum";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
inherit (finalAttrs) version pname;
|
||||
hash = "sha256-mU2r5xbYf6A1RibWqhow/637YxybCFMT3UzYcUMjhdg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w9l8dn4Ahck3NXuN4Ph9qmGoS767/mQRBgO9AT0CH3Y=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "BLAKE3 cryptographic hash function";
|
||||
mainProgram = "b3sum";
|
||||
@@ -27,6 +33,6 @@ rustPlatform.buildRustPackage rec {
|
||||
cc0
|
||||
asl20
|
||||
];
|
||||
changelog = "https://github.com/BLAKE3-team/BLAKE3/releases/tag/${version}";
|
||||
changelog = "https://github.com/BLAKE3-team/BLAKE3/releases/tag/${finalAttrs.version}";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "balena-cli";
|
||||
version = "24.0.2";
|
||||
version = "24.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "balena-io";
|
||||
repo = "balena-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E+vwcj6+pYDWlBgXdPagD/VrASelIbRroWC4HAn4c/c=";
|
||||
hash = "sha256-RoS0T8YuWHw+aXHkHURO+sQGJGaPP8olJ1Jau/lkh7g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-yVxsoemdxCS3oz3ULxPflLLNEdVD2EKRkQa7+7AFdiw=";
|
||||
npmDepsHash = "sha256-6rVP4cQ29W0UC20ULmXix/Ku8i5lqVjizVq+DkddJCs=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -99,7 +99,6 @@ let
|
||||
python3 = python3Packages.python;
|
||||
pyPkgsOpenusd = python3Packages.openusd.override (old: {
|
||||
opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
|
||||
withOsl = false;
|
||||
});
|
||||
|
||||
libdecor' = libdecor.overrideAttrs (old: {
|
||||
@@ -168,7 +167,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false)
|
||||
(lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport)
|
||||
(lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport)
|
||||
(lib.cmakeBool "WITH_CYCLES_OSL" false)
|
||||
(lib.cmakeBool "WITH_CYCLES_OSL" true)
|
||||
(lib.cmakeBool "WITH_HYDRA" openUsdSupport)
|
||||
(lib.cmakeBool "WITH_INSTALL_PORTABLE" false)
|
||||
(lib.cmakeBool "WITH_JACK" jackaudioSupport)
|
||||
@@ -268,6 +267,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
pugixml
|
||||
python3
|
||||
python3Packages.materialx
|
||||
python3Packages.openshadinglanguage
|
||||
rubberband
|
||||
zlib
|
||||
zstd
|
||||
@@ -325,6 +325,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
[
|
||||
ps.materialx
|
||||
ps.numpy_1
|
||||
ps.openshadinglanguage
|
||||
ps.requests
|
||||
ps.zstandard
|
||||
]
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "bottles-unwrapped";
|
||||
version = "61.1";
|
||||
version = "62.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = "bottles";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LW+os+5DtdUBZWONu2YX4FYMtAYg4BDlKbnVF64T2xI=";
|
||||
hash = "sha256-UqK5ULFgNPe9r2xFolU1R5LnlD3kLgBK0qGl48elEwM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -53,6 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mainProgram = "cargo-typify";
|
||||
homepage = "https://github.com/oxidecomputer/typify";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ david-r-cox ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "chezmoi";
|
||||
version = "2.69.3";
|
||||
version = "2.69.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+VEFQgUYrsjzZR9BzTFwbBuMO2OJ8tOKqCt+5jFld5A=";
|
||||
hash = "sha256-x809oaZk6vwkXMUAtIAnB2YTXH0zOjZVh75uClfBkH4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WNsAOcm+pfNIU96x49xHz1sWs0CNuosJL70QZ43fVb4=";
|
||||
vendorHash = "sha256-mPZaxrIhwRMcC0mmYBXU1lDcZy1p7iMSO7sfRUI/dU0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "1.1.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "claude-mergetool";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "9999years";
|
||||
repo = "claude-mergetool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MqAtr7SxbarllzDgOWvzUooiRNf08aAVaLdZHJzMnRI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RawDKKx+O79+TnLZRdatEcNDd4vLzTqHF2w1/D5zPjA=";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/claude-mergetool";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/9999years/claude-mergetool";
|
||||
changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}";
|
||||
description = "Resolve Git/jj merge conflicts automatically with claude-code";
|
||||
license = [ lib.licenses.mit ];
|
||||
maintainers = [ lib.maintainers._9999years ];
|
||||
mainProgram = "claude-mergetool";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
}
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "12.22.0";
|
||||
version = "12.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RauEf78cTRPHSmisDus/5XoROZp5VpZL0mKPXbRoPCw=";
|
||||
hash = "sha256-CTg2jfpCLTYuRx5R+9Si0Ig1NT1ZGXMFbcPPa8CbMKY=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-Hh6dsxelPuuU7ISa2E396iUUrYdttG2HdxnBxYlXcis=";
|
||||
vendorHash = "sha256-yL34BgWzDrd4SxJvij56cmnfY51uJ/ax+ENtdUxS0aw=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-machines";
|
||||
version = "347";
|
||||
version = "349";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-machines";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VXxR6/6nPaWA2FwT/bViu1FQAgqs0Jya1IyN5Oodfow=";
|
||||
hash = "sha256-6qoyjPzLyP9pb9VtzDyBgfpJ+AT1m53C328n+rlHGYw=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -53,13 +53,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit";
|
||||
version = "355";
|
||||
version = "356";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LD3bjb87AvElwMFB5YKwz04PEmWw+DWDP7RGBCzwSb4=";
|
||||
hash = "sha256-Mmxp/rh+4YQovAUdnNkKnjZXz1kcdnhG2TuBhNSXY+Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
+8
-6
@@ -12,7 +12,7 @@
|
||||
libpcap,
|
||||
libtins,
|
||||
openssl,
|
||||
protobuf,
|
||||
protobuf_21,
|
||||
xz,
|
||||
zlib,
|
||||
catch2,
|
||||
@@ -25,15 +25,17 @@
|
||||
tcpdump,
|
||||
wireshark-cli,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
protobuf = protobuf_21;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "compactor";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dns-stats";
|
||||
repo = "compactor";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-5Z14suhO5ghhmZsSj4DsSoKm+ct2gQFO6qxhjmx4Xm4=";
|
||||
};
|
||||
@@ -100,9 +102,9 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Tools to capture DNS traffic and record it in C-DNS files";
|
||||
homepage = "https://dns-stats.org/";
|
||||
changelog = "https://github.com/dns-stats/compactor/raw/${version}/ChangeLog.txt";
|
||||
changelog = "https://github.com/dns-stats/compactor/raw/${finalAttrs.version}/ChangeLog.txt";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ fdns ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpuid";
|
||||
version = "20250513";
|
||||
version = "20260220";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/cpuid-${finalAttrs.version}.src.tar.gz";
|
||||
sha256 = "sha256-b0dKIrWEhIjkVLAaMduA65WNVWdLUzlTP8DmrreTYms=";
|
||||
sha256 = "sha256-52IP11rlkRcfEQxJuZo5EokzoMqtAjto1KOEub4Lj/s=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
[
|
||||
{
|
||||
"pname": "CUE4Parse",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-OdcUExbfYsWKEveSjyRcYfKgUWh3dw+BHQlP94z6LDI="
|
||||
},
|
||||
{
|
||||
"pname": "DotNetZip",
|
||||
"version": "1.16.0",
|
||||
"hash": "sha256-RlzHkO7DxCvRkr+gpM8Abs34XbovmBTmXfO7LtnE75E="
|
||||
},
|
||||
{
|
||||
"pname": "Infrablack.UE4Config",
|
||||
"version": "0.7.2.97",
|
||||
"hash": "sha256-KoaJXzmFsaQxTRmGfDkFW1votjcmdDouYZANXK4kksw="
|
||||
},
|
||||
{
|
||||
"pname": "K4os.Compression.LZ4",
|
||||
"version": "1.3.6",
|
||||
"hash": "sha256-Vo2ofh0MNkxcvJZUkNPqft/IoA1QcU/awItB2i17rfs="
|
||||
},
|
||||
{
|
||||
"pname": "K4os.Compression.LZ4.Streams",
|
||||
"version": "1.3.6",
|
||||
"hash": "sha256-rnIDo/2WIlA7enlNxXMKyMjRu+VQPHtuCMqK3w1zQf4="
|
||||
},
|
||||
{
|
||||
"pname": "K4os.Hash.xxHash",
|
||||
"version": "1.0.8",
|
||||
"hash": "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8="
|
||||
},
|
||||
{
|
||||
"pname": "LZMA-SDK",
|
||||
"version": "22.1.1",
|
||||
"hash": "sha256-PI79dMSrLSmoJzQLSFxgfhDqdkyNvdlzFhxWbdrMKXs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "3.1.0",
|
||||
"hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "3.1.1",
|
||||
"hash": "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.3",
|
||||
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog",
|
||||
"version": "3.1.1",
|
||||
"hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Console",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI="
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine",
|
||||
"version": "2.0.0-beta4.22272.1",
|
||||
"hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "6.0.3",
|
||||
"hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.5",
|
||||
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.AccessControl",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Permissions",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Principal.Windows",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "4.7.1",
|
||||
"hash": "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Windows.Extensions",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
"version": "0.7.3",
|
||||
"hash": "sha256-uHmJzDeHPAr0u35lKwBDwWgoybM0ckP0gfSNDmTWcGk="
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,72 @@
|
||||
{
|
||||
buildDotnetModule,
|
||||
copyDesktopItems,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
name = "crosspatch";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickPlayzGITHUB";
|
||||
repo = "CrossPatch";
|
||||
hash = "sha256-Ux+tLP5Hv8ecnuITMqLiuX0YtF2ENZ7ezi2gNKfuNcM=";
|
||||
tag = version;
|
||||
};
|
||||
|
||||
python = python3.withPackages (ps: [
|
||||
ps.patool
|
||||
ps.py7zr
|
||||
ps.pyqtdarktheme
|
||||
ps.pyside6
|
||||
ps.rarfile
|
||||
ps.requests
|
||||
]);
|
||||
|
||||
parser = buildDotnetModule rec {
|
||||
inherit version src;
|
||||
pname = "crosspatch-parser";
|
||||
sourceRoot = "${src.name}/tools/CrossPatchParser";
|
||||
nugetDeps = ./dependencies.json;
|
||||
meta.mainProgram = "CrossPatchParser";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version src;
|
||||
pname = name;
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
postPatch = ''
|
||||
mkdir "$out"
|
||||
cp -r "$src/src" "$out/src"
|
||||
substituteInPlace "$out/src/PakInspector.py" --replace 'possible_paths = _possible_parser_paths()' 'possible_paths = ["${lib.getExe parser}"]'
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${lib.getExe python}" "$out/bin/crosspatch" --add-flag "$out/src/CrossPatch.py"
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
inherit name;
|
||||
desktopName = "CrossPatch";
|
||||
exec = "crosspatch";
|
||||
});
|
||||
|
||||
meta = {
|
||||
mainProgram = "crosspatch";
|
||||
description = "A mod Manager for Sonic Racing: CrossWorlds";
|
||||
homepage = "https://github.com/NickPlayzGITHUB/CrossPatch";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ toodeluna ];
|
||||
};
|
||||
}
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "delly";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dellytools";
|
||||
repo = "delly";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wlaRHCRcbj4Hw7PVYeB6N1bMS4FL3gPo1uC1OOmJwuA=";
|
||||
hash = "sha256-WnZf5JFDv5R//g0dm5riGvhwaqm/Yd7+qVPxseOpJ+Y=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2026-02-17";
|
||||
version = "0-unstable-2026-02-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = "discordo";
|
||||
rev = "f1650a0df751e40a589ceda4ec19626e109bac2b";
|
||||
hash = "sha256-+1XK5Zri7DiKzaqsFHYjzde1XEFlp4cj878+FzLaibg=";
|
||||
rev = "27dd6e09c8cde848261248a505a4efbabdcc9e09";
|
||||
hash = "sha256-3rr7mbbPw5jrON7J80TaCZ7lBALKdtZ6vI2+uGJJaoI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eltE7RkxqjYMWMv8/YmCC+WlntBTF8zO7UE0MQsG8Is=";
|
||||
vendorHash = "sha256-yzGKRrPPBjg/e9zkimCb99emLHBWM10FJvlL23HbTRU=";
|
||||
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doggo";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mr-karan";
|
||||
repo = "doggo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yKEjTaDwJVycsGeoJTVMjN9D4AzRLXZAY5fVIp+B14c=";
|
||||
hash = "sha256-x3A/Grg5ZLi8l3bvMPGmVFB9EcaEAO158daB8WV8Yqg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ybI17J5EKvigBapt8Ed2FuMEzGUVzEpJ6OTVYWXVOOc=";
|
||||
vendorHash = "sha256-5GU3d2TfKjCe4DSw177egJkEhRvPqHI1SoROrh2CIS8=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
subPackages = [ "cmd/doggo" ];
|
||||
|
||||
|
||||
@@ -232,7 +232,7 @@ let
|
||||
# (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)
|
||||
postPatch = ''
|
||||
substituteInPlace premake5.lua \
|
||||
--replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"'
|
||||
--replace-fail 'flags "LinkTimeOptimization"' 'linktimeoptimization "Off"'
|
||||
|
||||
substituteInPlace gframe/game.cpp \
|
||||
--replace-fail 'ocgcore = LoadOCGcore(Utils::GetWorkingDirectory())' 'ocgcore = LoadOCGcore("${lib.getLib ocgcore}/lib/")'
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
let
|
||||
pname = "electron-mail";
|
||||
version = "5.3.5";
|
||||
version = "5.3.6";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-xlDk/MwDs1DKzIx+8NyrS+yQw4u3gY5iTXvc2NWLn8s=";
|
||||
hash = "sha256-3BWrVMlSUMMmuj6EAmqVtlHGCcminuVHkyPnc3TvgpM=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg";
|
||||
hash = "sha256-5g/6ndODuK1OkeI2+DwYTZoDdgM+/qMYMgrFhHRPnAI=";
|
||||
hash = "sha256-z7j5WrU1F+iX8UDLWS5sXLwHjobPKJZFKXTcHTOQ/Eo=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg";
|
||||
hash = "sha256-qjqND/H5ng2gG+llZ1aM2ju8ITHPfMVZTzDdqN0lhnU=";
|
||||
hash = "sha256-7i0p7mBkzViXGdUrHXTrDDGdIy81p2YIei5Qsk8G5GU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.43.3";
|
||||
version = "0.43.4";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "geesefs";
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "yandex-cloud";
|
||||
repo = "geesefs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EwCWyN1wpG0CVt6vAjxNX0AYbHqblTtwKkbBIVDSJa0=";
|
||||
hash = "sha256-mel9gvmlMzA9WEst7Xx49O4LqmzVXzPJU45ddfO4GkI=";
|
||||
};
|
||||
|
||||
# hashes differ per architecture otherwise.
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "glooctl";
|
||||
version = "1.20.9";
|
||||
version = "1.20.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BbYsnLwBgZTwh3GWOd7F6hRD1ATVYspnN/iuqYhrt4o=";
|
||||
hash = "sha256-ZoeXxWaILJfsIQ7sowqT9Kt0PT7a3g5CdYk7ulP8ZEs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpxsee";
|
||||
version = "15.10";
|
||||
version = "15.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lXyxArPctaS9q+xeSpYBWPd9fdTffGNIBO39bMxZBCE=";
|
||||
hash = "sha256-OZC4ClQUbOKb1nZD6kmZ2s6oHudhkLLW0HSrYiFCJfg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
lrelease gpxsee.pro
|
||||
lrelease lang/*.ts
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
|
||||
changelog = "https://github.com/tumic0/GPXSee/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "GPS log file viewer and analyzer";
|
||||
mainProgram = "gpxsee";
|
||||
homepage = "https://www.gpxsee.org/";
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python311,
|
||||
python311Packages,
|
||||
python3,
|
||||
python3Packages,
|
||||
glibcLocales,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
@@ -17,7 +17,7 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
python311Packages.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "guake";
|
||||
version = "3.10.1";
|
||||
|
||||
@@ -30,6 +30,10 @@ python311Packages.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-TTDVJeM37SbpWucJGYoeYX9t4r1k3ldru9Cd02hBrU4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
distutils
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Avoid trying to recompile schema at runtime,
|
||||
# the package should be responsible for ensuring it is up to date.
|
||||
@@ -57,7 +61,7 @@ python311Packages.buildPythonApplication (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
python311Packages.pip
|
||||
python3Packages.pip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -66,18 +70,19 @@ python311Packages.buildPythonApplication (finalAttrs: {
|
||||
keybinder3
|
||||
libnotify
|
||||
libwnck
|
||||
python311
|
||||
python3
|
||||
vte
|
||||
];
|
||||
|
||||
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ];
|
||||
|
||||
propagatedBuildInputs = with python311Packages; [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dbus-python
|
||||
pycairo
|
||||
pygobject3
|
||||
setuptools-scm
|
||||
pyyaml
|
||||
distutils
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "legendary-heroic";
|
||||
version = "0.20.41";
|
||||
version = "0.20.42";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "legendary";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zX5Lyj8IDHETFyEpUaFnGaYZVs1hDy9rtwab1+rNlrw=";
|
||||
hash = "sha256-ZnOQhIGAgUvZVdPpxdothKzPElp/hdvUJA0mTpXLyIM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.20.0";
|
||||
version = "2.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gjQPQ/PwpDlBUfNF1JAlWUDGJa+7hwoQtouihdSCDqI=";
|
||||
hash = "sha256-nXDQxctzXI/kB6o1ShhrhiloWnpYObG66nMAwxijFto=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-JLUiPNxcOpwkYaabl2kP73fgr+WFyXQW8y6qDIb5gt4=";
|
||||
hash = "sha256-3SkCLoH4ZQzKZIdCkWOfBHt83vjxbpTpMvhMZPCysyI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,31 +6,31 @@
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nodejs,
|
||||
go_1_24,
|
||||
go_1_25,
|
||||
git,
|
||||
cacert,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
pname = "homebox";
|
||||
version = "0.22.3";
|
||||
version = "0.23.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sysadminsmedia";
|
||||
repo = "homebox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0/pf7jShuoME6it8GPXJ7ugoRLVfpEzu2uaUW0XFwJg=";
|
||||
hash = "sha256-bKPlaiAJUwEQbHKBRnUvwuPB4sTlgltUm426LsSQ7yQ=";
|
||||
};
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-pAMWPMZV5U7hIKNNFgRyyqZEH3wjUCplo7cQfKh1A6g=";
|
||||
vendorHash = "sha256-bHrpZ/zrXl/zjDgn8aETDZZBUQAfVgi6WLDUxFUSmiQ=";
|
||||
modRoot = "backend";
|
||||
# the goModules derivation inherits our buildInputs and buildPhases
|
||||
# Since we do pnpm thing in those it fails if we don't explicitly remove them
|
||||
overrideModAttrs = _: {
|
||||
nativeBuildInputs = [
|
||||
go_1_24
|
||||
go_1_25
|
||||
git
|
||||
cacert
|
||||
];
|
||||
@@ -42,7 +42,7 @@ buildGoModule {
|
||||
src = "${src}/frontend";
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-5AEwgI5rQzp/36USr+QEzjgllZkKhhIvlzl+9ZVfGM4=";
|
||||
hash = "sha256-MG2IzSOjdGIjuKOtbDlI6UY+67+6/AAsnBscFvs2V4o=";
|
||||
};
|
||||
pnpmRoot = "../frontend";
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
bzip2,
|
||||
xz,
|
||||
curl,
|
||||
libdeflate,
|
||||
perl,
|
||||
}:
|
||||
|
||||
@@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bzip2
|
||||
xz
|
||||
curl
|
||||
libdeflate
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "3.5.12",
|
||||
"hash": "sha256-NUWb2y8sTIzKTURJymb0Bvidz1tl+u3Q7o1UvEnIUtI=",
|
||||
"version": "3.5.13",
|
||||
"hash": "sha256-L+eU+zm6B+y1Rytz6cG50885sPffm5+m+NSAYNbTYa4=",
|
||||
"plugins": {
|
||||
"io.github.jackgruber.backup": {
|
||||
"name": "joplin-plugin-backup",
|
||||
@@ -9,5 +9,5 @@
|
||||
"npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0="
|
||||
}
|
||||
},
|
||||
"deps_hash": "sha256-9xJmudcpUw1xmTvJD3TFrfzYEi+LupZGSzsA5zUOemI="
|
||||
"deps_hash": "sha256-iDclcCwzgmKOMxO4ZdmPyTKPoGY24+6gm19E4+pCB50="
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k8sgpt";
|
||||
version = "0.4.28";
|
||||
version = "0.4.30";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "k8sgpt-ai";
|
||||
repo = "k8sgpt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hY1gyKy37SIASyhlWD+2aAeyfgfFpoBtm2XXIwCrh/Y=";
|
||||
hash = "sha256-8hzJEJ+aZ+nVleStMngRortRLEoW+6FhcYBgin3Z/3Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6RgcIGGhtgxWR90gQWxXYxID6L5bZLrLLH0S+MSIO2w=";
|
||||
vendorHash = "sha256-zljqZWM1jSAC+ZhW1NNp182Ui/40u0VTtfolnPXQKqE=";
|
||||
|
||||
# https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchgit,
|
||||
boost,
|
||||
cmake,
|
||||
cmark,
|
||||
cryptopp,
|
||||
extra-cmake-modules,
|
||||
immer,
|
||||
kdePackages,
|
||||
lager,
|
||||
libkazv,
|
||||
nlohmann_json,
|
||||
olm,
|
||||
pkg-config,
|
||||
qt6,
|
||||
zug,
|
||||
@@ -20,14 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kazv";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "lily-is.land";
|
||||
owner = "kazv";
|
||||
repo = "kazv";
|
||||
# Heavily mirrored. Click "Clone" at https://iron.lily-is.land/diffusion/K/ to see all mirrors
|
||||
src = fetchgit {
|
||||
url = "https://iron.lily-is.land/diffusion/K/kazv.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto=";
|
||||
hash = "sha256-7o6xUt/cryOg71/R33VBGpubskqlm9eYGSTyoGderDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lager
|
||||
libkazv
|
||||
nlohmann_json
|
||||
olm
|
||||
qt6.qtbase
|
||||
qt6.qtimageformats
|
||||
qt6.qtmultimedia
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "koji";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cococonscious";
|
||||
repo = "koji";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8z7lx0aVmA2gbydeJOBDVM2s6rwZpDLRaw1yqErwhJ4=";
|
||||
hash = "sha256-qKC4ayaNPSUh4wSElBWxk/P+Y2dFgCIFiMkI0/QztDY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dnidKrH/HSUpm8sU51G4e74NgyyO3v2sTK4eDKSJujA=";
|
||||
cargoHash = "sha256-vdELHNH1GqR0LPY3SSNgSR3krZZ85Tsx6aTHve0Vhe8=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "krew";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "krew";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-3GoC2HEp9XJe853/JYvX9kAAcFf7XxglVEeU9oQ/5Ms=";
|
||||
sha256 = "sha256-KG4/vtEfwWVddfFoNbC4xakxOynDY6jyxek4JAXW5gY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r4Dywm0+YxWWD59oaKodkldE2uq8hlt9MwOMYDaj6Gc=";
|
||||
vendorHash = "sha256-z0wiYknXcCx4vqROngn58CRe9TBgya4y3v736VBMhQ8=";
|
||||
|
||||
subPackages = [ "cmd/krew" ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubecm";
|
||||
version = "0.34.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunny0826";
|
||||
repo = "kubecm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UPjo21tbPCC+l6aWrTcYZEJ9a1k8/kJ7anBHWZSkYwI=";
|
||||
hash = "sha256-QShGRgszcsutSA9sOBXNvAwdTIqHOsMYQQPIXfA8z/M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-P+CkGgMCDpW/PaGFljj+WRxfeieuTFax6xvNq6p8lHw=";
|
||||
vendorHash = "sha256-TyJpFN8JEWpzCHKUX3iYUHhTOOAp5I1YEzhUkWPXx8A=";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.60.0";
|
||||
version = "0.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-L1DFcD6DdY+fQLznv26PPbeCTI6PCdBmsYnDb9WcRoc=";
|
||||
hash = "sha256-RhRpKUBlsswPStUoZQ9mFkMst77t4t7OodILaC4tHV0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
@@ -9,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyworktree";
|
||||
version = "1.28.0";
|
||||
version = "1.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "lazyworktree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-syfhjNsqRz9Gte514NcuP/J8NMGLEdsJrvnuqBHAnCc=";
|
||||
hash = "sha256-rNTzmvfVAToPzOvP+3wnL+zyQzL2mXQCnRY0cLKuQ6c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BfQWSogSoD0c71CPMqhfK7F+TzZQt6+wNIzPlFQ2zPU=";
|
||||
vendorHash = "sha256-Y4TZZ7Fhn1YSxG6YH0l0y0iWxgml93gOwKyTXWkjpqg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -32,8 +33,14 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 shell/functions.shell -t $out/share/lazyworktree
|
||||
install -Dm444 shell/functions.{bash,fish,zsh} -t $out/share/lazyworktree
|
||||
installManPage lazyworktree.1
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd lazyworktree \
|
||||
--bash <($out/bin/lazyworktree completion bash --code) \
|
||||
--zsh <($out/bin/lazyworktree completion zsh --code) \
|
||||
--fish <($out/bin/lazyworktree completion fish --code)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -36,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags =
|
||||
# doing this in configureFlags causes configure to fail
|
||||
lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS=-no-undefined";
|
||||
(lib.optional (!static && stdenv.hostPlatform.isCygwin) "LDFLAGS+=-no-undefined")
|
||||
++ (lib.optionals (!static && stdenv.hostPlatform.isWindows) [
|
||||
"LDFLAGS+=-no-undefined"
|
||||
"LDFLAGS+=-lws2_32"
|
||||
]);
|
||||
|
||||
meta = {
|
||||
description = "High-performance event loop/event model with lots of features";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchgit,
|
||||
boost,
|
||||
catch2_3,
|
||||
cmake,
|
||||
@@ -12,21 +12,20 @@
|
||||
libhttpserver,
|
||||
libmicrohttpd,
|
||||
nlohmann_json,
|
||||
olm,
|
||||
vodozemac-bindings-cpp,
|
||||
pkg-config,
|
||||
zug,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libkazv";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "lily-is.land";
|
||||
owner = "kazv";
|
||||
repo = "libkazv";
|
||||
# Heavily mirrored. Click "Clone" at https://iron.lily-is.land/diffusion/L/ to see all mirrors
|
||||
src = fetchgit {
|
||||
url = "https://iron.lily-is.land/diffusion/L/libkazv.git";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw=";
|
||||
hash = "sha256-rXQLbYPmD9UH0iXXqrAQSPF3KgIvjEyZ/97Q+/tl9Ec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libcpr_1_10_5
|
||||
libhttpserver
|
||||
libmicrohttpd
|
||||
olm
|
||||
nlohmann_json
|
||||
vodozemac-bindings-cpp
|
||||
zug
|
||||
];
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ in
|
||||
maintainers = with lib.maintainers; [
|
||||
dwrege
|
||||
fpletz
|
||||
hythera
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.buildPlatform.is32bit;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "147.0.4-1",
|
||||
"packageVersion": "148.0-1",
|
||||
"source": {
|
||||
"rev": "147.0.4-1",
|
||||
"hash": "sha256-xdeYyD1zwhQ5BzHzbQNCb3oHr4DAfwHGzbtGr2E3MR0="
|
||||
"rev": "148.0-1",
|
||||
"hash": "sha256-J2xY2PbVc1oSFP+PiAoVJUK+Qw2FUZtKuYz4TtRXWQs="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "147.0.4",
|
||||
"hash": "sha512-mBNokWWC4VZllKuOLAPKtHGq8EYT0sd6DU4GerFZu4G1kpqAG7rCDvBQbvBIzekbLi+JWY+o1OjWaoyAFrubMw=="
|
||||
"version": "148.0",
|
||||
"hash": "sha512-sOhiCR86B6AokPZBTne0M4kzZKi+r1ItRA6X7QBgybFL2y//3s3xLcqEnvzoxX2VpTSyPgQlnYOpbujyngeDSQ=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.4.2-2";
|
||||
hash_aarch64-darwin = "sha256-JadulYyHiXK+sQdp7Y6m5lQkkPkzut9O9Lc9kcW7bR4=";
|
||||
version_x86_64-linux = "0.4.2-2";
|
||||
hash_x86_64-linux = "sha256-JxGlqgsuLcW81mOIcntVFSHv19zSFouIChgz/egc+J0=";
|
||||
version_aarch64-darwin = "0.4.5-2";
|
||||
hash_aarch64-darwin = "sha256-mSszzDsoXv2D9Ky3K/P2Nn/mixq3HzGMonS1I4mz5+s=";
|
||||
version_x86_64-linux = "0.4.5-2";
|
||||
hash_x86_64-linux = "sha256-G+swwY9ff0Mqbdu8ZRbgm5KHrPhnOAaOYvH3dEVZ1+A=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.708";
|
||||
version = "0.709";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mGBwpu7KGCcwmLsx+Nv5xSaHxbAosB6P1x1IEz8/PHg=";
|
||||
hash = "sha256-qqexX0d/YFBbn/l59l3OI7KMpwScAtdmeJbGWk8ZEuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
nodejs,
|
||||
|
||||
python3,
|
||||
libtool,
|
||||
cctools,
|
||||
npmHooks,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
testers,
|
||||
|
||||
mailpit,
|
||||
nixosTests,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -43,6 +45,9 @@ let
|
||||
hash = source.npmDepsHash;
|
||||
};
|
||||
|
||||
# error "C++20 or later required." for dependency node_modules/tree-sitter
|
||||
env.NIX_CFLAGS_COMPILE = "-std=c++20";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
python3
|
||||
@@ -61,7 +66,7 @@ let
|
||||
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mailpit";
|
||||
inherit src version vendorHash;
|
||||
|
||||
@@ -69,33 +74,44 @@ buildGoModule {
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/axllent/mailpit/config.Version=${version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${ui} server/ui/dist
|
||||
cp -r ${finalAttrs.passthru.ui} server/ui/dist
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) mailpit;
|
||||
version = testers.testVersion {
|
||||
package = mailpit;
|
||||
command = "mailpit version --no-release-check";
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) mailpit;
|
||||
# cannot use versionCheckHook due to the extra --no-release-check flag
|
||||
# for workarounds and other solutions see https://github.com/NixOS/nixpkgs/pull/486143#discussion_r2754533347
|
||||
version = testers.testVersion {
|
||||
package = mailpit;
|
||||
command = "mailpit version --no-release-check";
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = {
|
||||
supportedFeatures = [ "commit" ];
|
||||
command = ./update.sh;
|
||||
};
|
||||
|
||||
inherit ui;
|
||||
};
|
||||
|
||||
passthru.updateScript = {
|
||||
supportedFeatures = [ "commit" ];
|
||||
command = ./update.sh;
|
||||
};
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Email and SMTP testing tool with API for developers";
|
||||
homepage = "https://github.com/axllent/mailpit";
|
||||
changelog = "https://github.com/axllent/mailpit/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ stephank ];
|
||||
description = "Email and SMTP testing tool with API for developers";
|
||||
downloadPage = "https://github.com/axllent/mailpit";
|
||||
homepage = "https://mailpit.axllent.org";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mailpit";
|
||||
maintainers = with lib.maintainers; [
|
||||
stephank
|
||||
phanirithvij
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
ldap3,
|
||||
ldaptor,
|
||||
matrix-synapse-unwrapped,
|
||||
packaging,
|
||||
pytestCheckHook,
|
||||
service-identity,
|
||||
setuptools,
|
||||
@@ -21,11 +22,17 @@ buildPythonPackage rec {
|
||||
hash = "sha256-i7ZRcXMWTUucxE9J3kEdjOvbLnBdXdHqHzhzPEoAnh0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/matrix-org/matrix-synapse-ldap3/pull/200
|
||||
./setuptools-pkg_resources.patch
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
service-identity
|
||||
ldap3
|
||||
packaging
|
||||
twisted
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From a879613c79861597525cdbab0d53dc4672c9a5a1 Mon Sep 17 00:00:00 2001
|
||||
From: Timotheus Pokorra <mailinglists@tpokorra.de>
|
||||
Date: Wed, 11 Feb 2026 06:54:10 +0100
|
||||
Subject: [PATCH] Replace pkg_resources.parse_version with
|
||||
packaging.version.parse
|
||||
|
||||
fixes #199
|
||||
---
|
||||
ldap_auth_provider.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ldap_auth_provider.py b/ldap_auth_provider.py
|
||||
index 25dd81b..1f1c9ef 100644
|
||||
--- a/ldap_auth_provider.py
|
||||
+++ b/ldap_auth_provider.py
|
||||
@@ -21,7 +21,7 @@
|
||||
import ldap3
|
||||
import ldap3.core.exceptions
|
||||
import synapse
|
||||
-from pkg_resources import parse_version
|
||||
+from packaging.version import parse as parse_version
|
||||
from synapse.module_api import ModuleApi
|
||||
from synapse.types import JsonDict
|
||||
from twisted.internet import threads
|
||||
@@ -20,8 +20,8 @@
|
||||
#
|
||||
# Ensure you also check ../mattermostLatest/package.nix.
|
||||
regex = "^v(10\\.11\\.[0-9]+)$";
|
||||
version = "10.11.11";
|
||||
srcHash = "sha256-TM/12cTlZngguZnL8KTPzyGo7HCYuuWeh8aRCpmQve8=";
|
||||
version = "10.11.12";
|
||||
srcHash = "sha256-bQSjn3Q3R4eHcmbrQ6obz1eGp7XuIdeSAhzl3UVHpB8=";
|
||||
vendorHash = "sha256-hKAKM2qFn5Zvr/Sc33XmFl7l59agMaEvlvVD5aOyaxI=";
|
||||
npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
|
||||
lockfileOverlay = ''
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo126Module,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
nixosTests,
|
||||
@@ -12,19 +12,19 @@ let
|
||||
hash = "sha256-QTqD4rsMd+0L8L4QXVOdF+9F39mEoLE+zTsUqQE4OTg=";
|
||||
};
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "mediamtx";
|
||||
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
||||
version = "1.16.0";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = "mediamtx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bi93rZnX8hymcmW6H/Iglujdv6LiqueitlVJbVlGNis=";
|
||||
hash = "sha256-F7DFDN+2hPHJAzRiodo5yR9evtUmtmvMtwgfeUqumAE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vxKltySKNXs1HDPeBk51OFyMrjM4bSbWTqRIWxMO1HQ=";
|
||||
vendorHash = "sha256-6ICHZ4Q/nOP/e1GKguLDcC+42Q6lxO6OdeK/8a1F+Uo=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${hlsJs} internal/servers/hls/hls.min.js
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "micronaut";
|
||||
version = "4.10.8";
|
||||
version = "4.10.9";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${finalAttrs.version}/micronaut-cli-${finalAttrs.version}.zip";
|
||||
hash = "sha256-sI4K0wvpOS/dwW4/NzM/cPJRKlU/uxFdl3flnZXo684=";
|
||||
hash = "sha256-/byUsXGPsIkVU7T0FENUkxx/TjkhzI+lX2Veo4JGOCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
|
||||
pname = "mongosh";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb-js";
|
||||
repo = "mongosh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JoHTHqBx7CKcpEzn82qK4Mp8zGzw4o/iYMhZAw6gpV0=";
|
||||
hash = "sha256-M0GHLO+KZFGn0bGYpPMfMnM1tDBFGsAnTyFUH/CjAyw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PgH5r2E94fKj5dhEDP6h68UoRq3KPvJuYdM1oAGuWXo=";
|
||||
npmDepsHash = "sha256-FP5Pzyu/ZEarUvcAEb5JuLugmnYdegsH2nL3p0RRTfE=";
|
||||
|
||||
patches = [
|
||||
./disable-telemetry.patch
|
||||
|
||||
@@ -23,7 +23,9 @@ let
|
||||
};
|
||||
|
||||
pname = "nextpnr";
|
||||
version = "0.9";
|
||||
|
||||
# Version 0.9 was patched (c7cfb) for Boost 1.87+ compatibility (boost system)
|
||||
version = "0.9-unstable-2026-02-08";
|
||||
|
||||
prjbeyond_src = fetchFromGitHub {
|
||||
owner = "YosysHQ-GmbH";
|
||||
@@ -39,8 +41,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
tag = "${pname}-${version}";
|
||||
hash = "sha256-rpg99k7rSNU4p5D0iXipLgNNOA2j0PdDsz8JTxyYNPM=";
|
||||
rev = "35f14336c042a9aa86cc66221434262fbb02034e";
|
||||
hash = "sha256-5Fn/Y+pjhnGFcZsCN7XZN0nPB9u/BIr+lxgrCC5pnpE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -49,6 +51,7 @@ stdenv.mkDerivation rec {
|
||||
python3
|
||||
]
|
||||
++ (lib.optional enableGui wrapQtAppsHook);
|
||||
|
||||
buildInputs = [
|
||||
boostPython
|
||||
eigen
|
||||
@@ -59,13 +62,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags =
|
||||
let
|
||||
# the specified version must always start with "nextpnr-", so add it if
|
||||
# missing (e.g. if the user overrides with a git hash)
|
||||
# Use the commit hash for the internal versioning
|
||||
rev = src.rev;
|
||||
version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}";
|
||||
versionStr = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${lib.substring 0 7 rev}";
|
||||
in
|
||||
[
|
||||
"-DCURRENT_GIT_VERSION=${version}"
|
||||
"-DCURRENT_GIT_VERSION=${versionStr}"
|
||||
"-DARCH=generic;ice40;ecp5;himbaechel"
|
||||
"-DBUILD_TESTS=ON"
|
||||
"-DICESTORM_INSTALL_PREFIX=${icestorm}"
|
||||
|
||||
@@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
|
||||
];
|
||||
]
|
||||
++ (lib.optional stdenv.hostPlatform.isWindows "-DENABLE_LIB_ONLY=1");
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/v${finalAttrs.version}";
|
||||
description = "Implementation of HTTP/3 mapping over QUIC and QPACK in C";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||
maintainers = with lib.maintainers; [ izorkin ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "node-problem-detector";
|
||||
version = "1.35.1";
|
||||
version = "1.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "node-problem-detector";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-0N1EJjULH/Tff4v6JMrvJdO3Iq8EY8gt6xbbh21D8io=";
|
||||
sha256 = "sha256-hDf6F9sCrX6vu9FJlXTMRtGaA+gwI7PdqD9GKINHPO0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nodemon";
|
||||
version = "3.1.11";
|
||||
version = "3.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remy";
|
||||
repo = "nodemon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nW3JTbz5fJ7nEqsB1ER7N3IiOu2GkUl5o9vZQZzkfxI=";
|
||||
hash = "sha256-Kk42VjCmbkAfYzZEh4njyA4fodjmeCxIDraAZ8Hsd4g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU=";
|
||||
npmDepsHash = "sha256-XjbzoF83qhdvtKt22Onrm0hH+Bjh724Zm+qVoZsY/pM=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
rename,
|
||||
nixosTests,
|
||||
variants ? [ ],
|
||||
suffix ? "",
|
||||
@@ -31,6 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-vhu3jojG6QlgY5gP4bCbpJznsQ1gExAfcRT42FcZUp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rename
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"megamerge" # Experimental fonts created by merging regular notofonts
|
||||
@@ -71,7 +76,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
fi
|
||||
done
|
||||
''
|
||||
);
|
||||
)
|
||||
+ ''
|
||||
rename 's/\[.*\]//' $out/share/fonts/noto/*
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "noto-monthly-release-";
|
||||
|
||||
@@ -92,14 +92,14 @@ let
|
||||
(self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.11.6";
|
||||
version = "1.11.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
hash = "sha256-iCxxfW5mPYoOfdsBxeAp+kUFU9hMHq+2RcGekITyMFI=";
|
||||
hash = "sha256-X9+o3EpTtKAFiSmjOumRCDKNwBc9LVjvqyZqun3yDi8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@@ -14,16 +14,16 @@ assert
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "open-policy-agent";
|
||||
version = "1.13.2";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dQtDFk8Qessso37fjH56xeTNPs9r8WF8YJpkV1tS7U4=";
|
||||
hash = "sha256-U4Yrib38zY+Xk7Ogo6OfD/G46YxSfnpnUNd74zlo+7o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Jn0vi1Ihyeog/LaUcuu/V9dd8l9LSdRSbtH1GPJrT50=";
|
||||
vendorHash = "sha256-BS0qYV3hU+WWkm/LWKUhM9Y+IT3rqi9gwvg2TT9HZqw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,25 +1,27 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
bzip2,
|
||||
cmake,
|
||||
enablePython ? true,
|
||||
fetchFromGitHub,
|
||||
fmt,
|
||||
giflib,
|
||||
libheif,
|
||||
libjpeg,
|
||||
libjxl,
|
||||
libpng,
|
||||
libtiff,
|
||||
libwebp,
|
||||
libjxl,
|
||||
libheif,
|
||||
libultrahdr,
|
||||
libwebp,
|
||||
opencolorio,
|
||||
openexr,
|
||||
openjph,
|
||||
robin-map,
|
||||
unzip,
|
||||
fmt,
|
||||
bzip2,
|
||||
ptex,
|
||||
python3Packages,
|
||||
robin-map,
|
||||
stdenv,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -47,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
bzip2
|
||||
giflib
|
||||
libheif
|
||||
libjpeg
|
||||
@@ -58,17 +61,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencolorio
|
||||
openexr
|
||||
openjph
|
||||
robin-map
|
||||
bzip2
|
||||
ptex
|
||||
];
|
||||
robin-map
|
||||
]
|
||||
++ lib.optional enablePython python3Packages.pybind11;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fmt
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_PYTHON=OFF"
|
||||
(lib.cmakeBool "USE_PYTHON" enablePython)
|
||||
"-DUSE_QT=OFF"
|
||||
# GNUInstallDirs
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
|
||||
|
||||
+17
-13
@@ -1,23 +1,23 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
bison,
|
||||
boost,
|
||||
clang,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
flex,
|
||||
lib,
|
||||
libclang,
|
||||
libxml2,
|
||||
zlib,
|
||||
llvm,
|
||||
openexr,
|
||||
openimageio,
|
||||
llvm,
|
||||
boost,
|
||||
flex,
|
||||
bison,
|
||||
partio,
|
||||
pugixml,
|
||||
python3Packages,
|
||||
robin-map,
|
||||
stdenv,
|
||||
util-linux,
|
||||
python3,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+PNh4xFdH8onxK0OTnQHbdupTaB2hTgDumY0krJiWUE=";
|
||||
};
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openimageio
|
||||
partio
|
||||
pugixml
|
||||
python3.pkgs.pybind11
|
||||
python3Packages.pybind11
|
||||
robin-map
|
||||
util-linux # needed just for hexdump
|
||||
zlib
|
||||
@@ -79,6 +79,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxml2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.openimageio
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$out"/lib/pkgconfig/*.pc \
|
||||
--replace '=''${exec_prefix}//' '=/'
|
||||
@@ -86,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = "https://opensource.imageworks.com/osl.html";
|
||||
homepage = "http://openshadinglanguage.org";
|
||||
maintainers = with lib.maintainers; [ hodapp ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Parallel Presolve for Integer and Linear Optimization";
|
||||
license = with lib.licenses; [ lgpl3Plus ];
|
||||
mainProgram = "papilo";
|
||||
maintainers = with lib.maintainers; [ david-r-cox ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
krb5,
|
||||
withGssapi ? true,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -17,6 +19,10 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-1yTSQ3ktAtUfy2nKm98hFX+A7eR0z5FoKbM2vAJQWbU=";
|
||||
|
||||
buildInputs = lib.optionals withGssapi [ krb5 ];
|
||||
|
||||
tags = lib.optionals withGssapi [ "gssapi" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@@ -90,6 +90,8 @@ buildGoModule (finalAttrs: {
|
||||
src
|
||||
;
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
@@ -198,7 +200,6 @@ buildGoModule (finalAttrs: {
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
version = "3.9.1";
|
||||
hash = "sha256-kqqWFvzEfpG+e+7ils9KE/RNs0eadLqrzMQJsSunQOM=";
|
||||
npmDepsHash = "sha256-Z+EaIDQLgJ1YQ9tmGZLtvOVaDvZX1qeJJxsCAd/h41k=";
|
||||
vendorHash = "sha256-CGec9hR/BpO3rXNGYm0V9AESsGIR6a0734e8t9oMOpA=";
|
||||
version = "3.10.0";
|
||||
hash = "sha256-tTxHLngOsJ0STwfnBfuXN7CUaVgtpRGzEiFtXTWVDD4=";
|
||||
npmDepsHash = "sha256-+nu7qfxlVa8OWARFgQnXj5riTQ0P1sjxbIgYUvJpcHw=";
|
||||
vendorHash = "sha256-AsVy9RPemaKDuX8is2IXjlzRBsJFJiRfFj18SQl8Oc8=";
|
||||
}
|
||||
|
||||
@@ -1,164 +1,95 @@
|
||||
diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs
|
||||
index f68e185..355723e 100644
|
||||
--- a/src-tauri/src/qf_client/modules/analytics.rs
|
||||
+++ b/src-tauri/src/qf_client/modules/analytics.rs
|
||||
@@ -37,7 +37,7 @@ impl AnalyticsModule {
|
||||
current_page: "home".to_string(),
|
||||
component: "Analytics".to_string(),
|
||||
is_init: false,
|
||||
- send_metrics: true,
|
||||
+ send_metrics: false,
|
||||
last_user_activity: Arc::new(Mutex::new(Instant::now())),
|
||||
metricAndLabelPairsScheduledToSend: vec![],
|
||||
}
|
||||
@@ -77,90 +77,7 @@ impl AnalyticsModule {
|
||||
}
|
||||
pub fn init(&mut self) -> Result<(), AppError> {
|
||||
let app = states::app_state()?;
|
||||
- if self.is_init {
|
||||
- return Ok(());
|
||||
- }
|
||||
- self.is_init = true;
|
||||
- self.update_state();
|
||||
-
|
||||
- let is_first_install = app.is_first_install.clone();
|
||||
- tauri::async_runtime::spawn({
|
||||
diff --git a/src-tauri/qf_api/src/endpoints/analytics.rs b/src-tauri/qf_api/src/endpoints/analytics.rs
|
||||
index b7ea6076..1476cfc1 100644
|
||||
--- a/src-tauri/qf_api/src/endpoints/analytics.rs
|
||||
+++ b/src-tauri/qf_api/src/endpoints/analytics.rs
|
||||
@@ -52,35 +52,7 @@ impl AnalyticsRoute {
|
||||
|
||||
pub fn start(self: Arc<Self>) -> Result<(), ApiError> {
|
||||
let mut stop = self._stop.lock().unwrap();
|
||||
- *stop = false;
|
||||
- tokio::spawn({
|
||||
- let this = Arc::clone(&self);
|
||||
- async move {
|
||||
- // Create a new instance of the QFClient and store it in the app state
|
||||
- let qf = states::qf_client().expect("Failed to get qf client");
|
||||
-
|
||||
- // Create Timer for sending metrics
|
||||
- let mut last_metric_time = Instant::now();
|
||||
-
|
||||
- if is_first_install {
|
||||
- qf.analytics()
|
||||
- .metricAndLabelPairsScheduledToSend
|
||||
- .push(HashMap::from([(
|
||||
- "First_Install".to_string(),
|
||||
- "true".to_string(),
|
||||
- )]));
|
||||
- }
|
||||
- loop {
|
||||
- let send_metrics = qf.analytics().send_metrics;
|
||||
- if !send_metrics {
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(60)).await;
|
||||
- if *this._stop.lock().unwrap() {
|
||||
- break;
|
||||
- }
|
||||
- if last_metric_time.elapsed() < Duration::from_secs(30) || !this.is_active() {
|
||||
- tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- if last_metric_time.elapsed() < Duration::from_secs(15)
|
||||
- || !qf.analytics().is_user_active()
|
||||
- {
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- if last_metric_time.elapsed() < Duration::from_secs(60)
|
||||
- && !qf.analytics().is_user_active()
|
||||
- {
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- last_metric_time = Instant::now();
|
||||
- // logger::info_con(
|
||||
- // &qf.analytics().get_component("TrySendAnalytics"),
|
||||
- // "Sending user activity",
|
||||
- // );
|
||||
- match qf
|
||||
- .analytics()
|
||||
- .try_send_analytics(
|
||||
- "users/metrics/periodic",
|
||||
- 3,
|
||||
- json!(qf.analytics().metricAndLabelPairsScheduledToSend),
|
||||
- )
|
||||
- .await
|
||||
- {
|
||||
-
|
||||
- match this.send_current_metrics().await {
|
||||
- Ok(_) => {
|
||||
- qf.analytics().clear_metrics();
|
||||
- this._metrics.lock().unwrap().clear();
|
||||
- }
|
||||
- Err(e) => {
|
||||
- if e.cause().contains("Unauthorized")
|
||||
- || e.cause().contains("Banned")
|
||||
- || e.cause().contains("WFMBanned")
|
||||
- {
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- break;
|
||||
- } else if e.cause().contains("429") {
|
||||
- logger::info(
|
||||
- &qf.analytics().get_component("TrySendAnalytics"),
|
||||
- "Rate limit reached, waiting for 60 seconds",
|
||||
- LoggerOptions::default(),
|
||||
- );
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(60)).await;
|
||||
- continue;
|
||||
- }
|
||||
- error::create_log_file("analytics.log", &e);
|
||||
- eprintln!("Failed to send metrics: {}", e);
|
||||
- }
|
||||
- };
|
||||
- // Sleep for a while before checking again
|
||||
- tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||
- }
|
||||
- qf.analytics().is_init = false;
|
||||
- }
|
||||
- });
|
||||
+ self.is_init = false;
|
||||
+ *stop = true;
|
||||
Ok(())
|
||||
}
|
||||
pub fn set_send_metrics(&mut self, send_metrics: bool) {
|
||||
@@ -173,45 +90,6 @@ impl AnalyticsModule {
|
||||
|
||||
@@ -100,40 +72,6 @@ impl AnalyticsRoute {
|
||||
mut retry_count: i64,
|
||||
data: Value,
|
||||
) -> Result<(), AppError> {
|
||||
- let mut parameters: Vec<String> = vec![];
|
||||
- if self.is_user_active() {
|
||||
- parameters.push(format!("Active_Page={}", self.current_page));
|
||||
- }
|
||||
) -> Result<(), ApiError> {
|
||||
- let client = self.client.upgrade().expect("Client should not be dropped");
|
||||
-
|
||||
- while retry_count >= 0 {
|
||||
- let err = match self
|
||||
- .client
|
||||
- .post::<Value>(
|
||||
- format!("{}?{}", url, parameters.join("&")).as_str(),
|
||||
- data.clone(),
|
||||
- let err = match client
|
||||
- .call_api::<Value>(
|
||||
- Method::POST,
|
||||
- format!("{}", url).as_str(),
|
||||
- Some(data.clone()),
|
||||
- None,
|
||||
- ResponseFormat::Json,
|
||||
- )
|
||||
- .await
|
||||
- {
|
||||
- Ok(ApiResult::Success(_, _)) => {
|
||||
- Ok(_) => {
|
||||
- return Ok(());
|
||||
- }
|
||||
- Ok(ApiResult::Error(e, _headers)) => AppError::new_api(
|
||||
- &self.get_component("TrySendAnalytics"),
|
||||
- e,
|
||||
- eyre!("Failed to send analytics"),
|
||||
- LogLevel::Error,
|
||||
- ),
|
||||
- Err(e) => e,
|
||||
- };
|
||||
- if let ApiError::UserBanned(_) = &err {
|
||||
- let mut stop = self._stop.lock().unwrap();
|
||||
- *stop = true;
|
||||
- return Err(err);
|
||||
- }
|
||||
-
|
||||
- if retry_count == 0 {
|
||||
- return Err(err);
|
||||
- }
|
||||
- retry_count -= 1;
|
||||
- logger::warning(
|
||||
- &self.get_component("TrySendAnalytics"),
|
||||
- &format!(
|
||||
- "Failed to send analytics, retrying in 5 seconds, retries left: {}",
|
||||
- retry_count
|
||||
- ),
|
||||
- LoggerOptions::default(),
|
||||
- println!(
|
||||
- "Retrying to send analytics data, attempts left: {}",
|
||||
- retry_count
|
||||
- );
|
||||
- tokio::time::sleep(std::time::Duration::from_secs(5)).await;
|
||||
- }
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx
|
||||
index 7897db9..1945ab9 100644
|
||||
index 673440d9..26d09d0b 100644
|
||||
--- a/src/contexts/app.context.tsx
|
||||
+++ b/src/contexts/app.context.tsx
|
||||
@@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) {
|
||||
const id = context.substring(start, end);
|
||||
@@ -124,7 +124,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) {
|
||||
const end = context.indexOf("</ID>");
|
||||
const id = context.substring(start, end);
|
||||
|
||||
console.log("OpenTos", settings?.tos_uuid, id);
|
||||
- if (id == settings?.tos_uuid) return;
|
||||
+ if (true) return;
|
||||
modals.open({
|
||||
title: useTranslateModals("tos.title"),
|
||||
size: "100%",
|
||||
- if (id == info?.tos_uuid) return;
|
||||
+ if (info || true) return;
|
||||
const modalId = modals.open({
|
||||
title: useTranslateComponent("modals.tos.title", { version: id }),
|
||||
withCloseButton: false,
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index d2ca05f1..37693a7b 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -25,11 +25,11 @@
|
||||
"@mantine/notifications": "8.3.8",
|
||||
"@mantine/tiptap": "8.3.8",
|
||||
"@tanstack/react-query": "^5.64.1",
|
||||
- "@tauri-apps/api": "^2.0.0",
|
||||
+ "@tauri-apps/api": "2.6.0",
|
||||
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
|
||||
"@tauri-apps/plugin-dialog": "~2",
|
||||
- "@tauri-apps/plugin-fs": "~2",
|
||||
- "@tauri-apps/plugin-http": "~2",
|
||||
+ "@tauri-apps/plugin-fs": "2.3.0",
|
||||
+ "@tauri-apps/plugin-http": "2.4.4",
|
||||
"@tauri-apps/plugin-notification": "~2",
|
||||
"@tauri-apps/plugin-os": "~2",
|
||||
"@tauri-apps/plugin-process": "~2",
|
||||
@@ -66,4 +66,4 @@
|
||||
"vite": "^4.5.0",
|
||||
"vite-plugin-svgr": "^2.4.0"
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
|
||||
index 531c77f5..dc542aca 100644
|
||||
--- a/pnpm-lock.yaml
|
||||
+++ b/pnpm-lock.yaml
|
||||
@@ -48,8 +48,8 @@ importers:
|
||||
specifier: ^5.64.1
|
||||
version: 5.64.1(react@18.3.1)
|
||||
'@tauri-apps/api':
|
||||
- specifier: ^2.0.0
|
||||
- version: 2.0.0
|
||||
+ specifier: 2.6.0
|
||||
+ version: 2.6.0
|
||||
'@tauri-apps/plugin-clipboard-manager':
|
||||
specifier: ^2.3.0
|
||||
version: 2.3.0
|
||||
@@ -57,11 +57,11 @@ importers:
|
||||
specifier: ~2
|
||||
version: 2.2.0
|
||||
'@tauri-apps/plugin-fs':
|
||||
- specifier: ~2
|
||||
- version: 2.2.0
|
||||
+ specifier: 2.3.0
|
||||
+ version: 2.3.0
|
||||
'@tauri-apps/plugin-http':
|
||||
- specifier: ~2
|
||||
- version: 2.2.0
|
||||
+ specifier: 2.4.4
|
||||
+ version: 2.4.4
|
||||
'@tauri-apps/plugin-notification':
|
||||
specifier: ~2
|
||||
version: 2.2.1
|
||||
@@ -767,11 +767,8 @@ packages:
|
||||
peerDependencies:
|
||||
react: ^18 || ^19
|
||||
|
||||
- '@tauri-apps/api@2.0.0':
|
||||
- resolution: {integrity: sha512-moKgCp2EX7X5GiOx/G/bmoEpkFQVVmyS98UaJU4xUVzan+E1BdwlAKcbip+cGldshYOqL4JSwAEN1OkRXeug0Q==}
|
||||
-
|
||||
- '@tauri-apps/api@2.7.0':
|
||||
- resolution: {integrity: sha512-v7fVE8jqBl8xJFOcBafDzXFc8FnicoH3j8o8DNNs0tHuEBmXUDqrCOAzMRX0UkfpwqZLqvrvK0GNQ45DfnoVDg==}
|
||||
+ '@tauri-apps/api@2.6.0':
|
||||
+ resolution: {integrity: sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==}
|
||||
|
||||
'@tauri-apps/cli-darwin-arm64@2.2.5':
|
||||
resolution: {integrity: sha512-qdPmypQE7qj62UJy3Wl/ccCJZwsv5gyBByOrAaG7u5c/PB3QSxhNPegice2k4EHeIuApaVJOoe/CEYVgm/og2Q==}
|
||||
@@ -844,11 +841,11 @@ packages:
|
||||
'@tauri-apps/plugin-dialog@2.2.0':
|
||||
resolution: {integrity: sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==}
|
||||
|
||||
- '@tauri-apps/plugin-fs@2.2.0':
|
||||
- resolution: {integrity: sha512-+08mApuONKI8/sCNEZ6AR8vf5vI9DXD4YfrQ9NQmhRxYKMLVhRW164vdW5BSLmMpuevftpQ2FVoL9EFkfG9Z+g==}
|
||||
+ '@tauri-apps/plugin-fs@2.3.0':
|
||||
+ resolution: {integrity: sha512-G9gEyYVUaaxhdRJBgQTTLmzAe0vtHYxYyN1oTQzU3zwvb8T+tVLcAqCdFMWHq0qGeGbmynI5whvYpcXo5LvZ1w==}
|
||||
|
||||
- '@tauri-apps/plugin-http@2.2.0':
|
||||
- resolution: {integrity: sha512-ZY6sIHhgu8hcu6BkkegoiOEbvOsQFSVcK8J7l+g9RNHrkhl5uzpNIytR4R/H50fj7gyG80DJvrXDx/LBo7Easw==}
|
||||
+ '@tauri-apps/plugin-http@2.4.4':
|
||||
+ resolution: {integrity: sha512-IjlaaS4z8ybB10qnh6djZ2FIaHdWVs/U1D1C56udKcjX1f+jAmR8/s7qBV5cv/OmcGkOIzet3LWuH70LKf4J2A==}
|
||||
|
||||
'@tauri-apps/plugin-notification@2.2.1':
|
||||
resolution: {integrity: sha512-QF8Zod6XDhxD6xkD5nU/BjbOpJ6+3gxGCrVULOdLpvMuMSN2Z2IdObV/qgnrEJk1UamUCF1ClQUqNCbk4zTJNQ==}
|
||||
@@ -2835,9 +2832,7 @@ snapshots:
|
||||
'@tanstack/query-core': 5.64.1
|
||||
react: 18.3.1
|
||||
|
||||
- '@tauri-apps/api@2.0.0': {}
|
||||
-
|
||||
- '@tauri-apps/api@2.7.0': {}
|
||||
+ '@tauri-apps/api@2.6.0': {}
|
||||
|
||||
'@tauri-apps/cli-darwin-arm64@2.2.5':
|
||||
optional: true
|
||||
@@ -2884,39 +2879,39 @@ snapshots:
|
||||
|
||||
'@tauri-apps/plugin-clipboard-manager@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.7.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-dialog@2.2.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
- '@tauri-apps/plugin-fs@2.2.0':
|
||||
+ '@tauri-apps/plugin-fs@2.3.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
- '@tauri-apps/plugin-http@2.2.0':
|
||||
+ '@tauri-apps/plugin-http@2.4.4':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-notification@2.2.1':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-os@2.2.1':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-process@2.2.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-shell@2.2.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.0.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tauri-apps/plugin-updater@2.9.0':
|
||||
dependencies:
|
||||
- '@tauri-apps/api': 2.7.0
|
||||
+ '@tauri-apps/api': 2.6.0
|
||||
|
||||
'@tiptap/core@3.6.2(@tiptap/pm@3.6.2)':
|
||||
dependencies:
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
cargo-tauri,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pkg-config,
|
||||
@@ -15,17 +15,18 @@
|
||||
libsoup_3,
|
||||
libayatana-appindicator,
|
||||
gtk3,
|
||||
gst_all_1,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "quantframe";
|
||||
version = "1.5.9";
|
||||
version = "1.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kenya-DK";
|
||||
repo = "quantframe-react";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jrGDgK/Z9oLSvtFfC+uIs0vj4Nku4Sp/bdR1MX/SK2E=";
|
||||
hash = "sha256-IF+8filOXG+4nWpivyYknkT+hAg8nhG10Hfm79/m3Uc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -36,16 +37,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false'
|
||||
'';
|
||||
|
||||
patches = [ ./0001-disable-telemetry.patch ];
|
||||
patches = [
|
||||
./0001-disable-telemetry.patch
|
||||
./0002-sync-node-packages.patch
|
||||
];
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-ncoxliXnLxWEXL1Z7ixOULI/uYkxmfLiDWu1tDSRsrM=";
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-omomvnHUiEfGVJn6LApWOnRwSVO8kpMLN3Jz0MhwPpQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0IgQK0jMVN6u5i4lBKK8njbMyRQCLguTdDcSBnFnyso=";
|
||||
cargoHash = "sha256-Ffy7dutFVQNZUFm9/iW0qPqUJ9bbRW6PeuC3eNNqfk8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
@@ -53,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
wrapGAppsHook3
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -63,6 +72,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
gtk3
|
||||
libayatana-appindicator
|
||||
webkitgtk_4_1
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "rancher";
|
||||
version = "2.13.2";
|
||||
version = "2.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5nGUxdhMhhwDaVRwURis3FElMonwoe8h6M09EDwf+Bc=";
|
||||
hash = "sha256-/bax1qW79DelgeOpp6PuQ7jNsB/Z82T7vxmlO5DmxtQ=";
|
||||
};
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
"-static"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-CQkM7zC5RPCguGp6dxBSjnDkWe11hp5v6QwZ6kRAXQE=";
|
||||
vendorHash = "sha256-9PpU28Uy/cQgQZT2MSA/kNh2+PFSDcGxkSWpBHUpKCg=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/rancher
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.12.2",
|
||||
"version": "1.12.3",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "1vr9gn70nisyiynglaq29l3rqfxn68lga5x3h5ycwl15ybkmv8wc"
|
||||
"sha256": "036q4jxc0sx01qb7bfm1r1jfimkzjaijkdqh1yxbxc5vvna2pd34"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "14dmwmf5w7f58bi5hyb607ybjpajh2y37k3d6gw3kri2ww5lg1r6"
|
||||
"sha256": "0avzzyvf59l4d63pl80wqfiw2l8gdfphz85a000ig3mfqqz3hrrg"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "0yf81yd1a9mfyiikyrjqhc8nanr932b1inyxdfwqba9vhc6r29b3"
|
||||
"sha256": "05xrq0gr13l337a7bjrz13f5kjbh1fv2w97lli9fqsyn4sghchrv"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "00p8i6fb8czy1pfn8yjjzrl9mcn28mx5yjz0k3fc292ag2dly46q"
|
||||
"sha256": "022psrs9xhfpdx52fjygfxkn7mwpdvp8dbsvdn7v1km2gpdmvxdx"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
xz,
|
||||
zlib,
|
||||
mpi,
|
||||
mpiCheckPhaseHook,
|
||||
withPtScotch ? false,
|
||||
testers,
|
||||
pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false
|
||||
@@ -18,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scotch";
|
||||
version = "7.0.10";
|
||||
version = "7.0.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "scotch";
|
||||
repo = "scotch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qeMgTkoM/RDsZa0T6hmrDLbLuSeR8WNxllyHSlkMVzA=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ljz4Xu3ztxhx8c+gRYABG85T9SuauQc4UsVHPmREvkk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -39,8 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "BUILD_PTSCOTCH" withPtScotch)
|
||||
# Prefix Scotch version of MeTiS routines
|
||||
(lib.cmakeBool "SCOTCH_METIS_PREFIX" true)
|
||||
# building tests is broken with SCOTCH_METIS_PREFIX enabled, at least since 7.0.9
|
||||
(lib.cmakeBool "ENABLE_TESTS" false)
|
||||
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mpi
|
||||
];
|
||||
|
||||
nativeCheckInputs = lib.optionals withPtScotch [
|
||||
mpiCheckPhaseHook
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = withPtScotch;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# SCOTCH provide compatibility with Metis/Parmetis interface.
|
||||
# We install the metis compatible headers to subdirectory to
|
||||
# avoid conflict with metis/parmetis.
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sd";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmln";
|
||||
repo = "sd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA=";
|
||||
hash = "sha256-HK53+1oH3EJm4Tg6BhLtG575FlBREb0OCetIQuCsBNc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KbEw09tTsUl9BLQsL7lW4VQq6D9E4lBiZf3Jrthst2Y=";
|
||||
cargoHash = "sha256-iOCIX7hq8RqRihVQrVoU2qCTSziuJePxsexkDSCZS9c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -55,13 +55,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "7.90.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MkvIv9ohFtu4e3IK4hciWC32xiw18/kdm7pHEc436Bc=";
|
||||
hash = "sha256-7Z9VoqNYTrAdIAeXVijJofThYuMMcDTVykwdWrpOmX0=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -72,8 +72,8 @@ let
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname src version;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-m/JxsKnVhcya7dUz1MBMQKwEdqoV3xQiGOoT4egh3K4=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-WbdYcI5y01gdS9AIzy4VZZ6eFaTHaVPscTawLSsHzlc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -160,18 +160,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 1;
|
||||
fetcherVersion = 3;
|
||||
hash =
|
||||
if withAppleEmojis then
|
||||
"sha256-sXDAAbrRFgOT+wRZqHAjEudmcUdBEbpkPWJpiB+MqDw="
|
||||
"sha256-BsHBdN9pk3Fi6HRJuMmMD9QU/iie2m1jZy/zSsIO6Q8="
|
||||
else
|
||||
"sha256-uEXm4lFTJ7U9I/I1UiETy1fIHzAPP7tr9SsPQ5lWsFw=";
|
||||
"sha256-3HLBKd2KzGWUuhIWCPx2teub9isYMHKYw0cgPVOueQI=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1771441806;
|
||||
SOURCE_DATE_EPOCH = 1772057792;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Disable code signing during local macOS builds.
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2026-02-12";
|
||||
version = "2.0.0-unstable-2026-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "7b2b26547da4b644d646686a53b087d26ac7413f";
|
||||
hash = "sha256-5ObudXMbUD37LbbtGKW9SDxPHaZx6QBMh+66fyY3NGo=";
|
||||
rev = "b526a54a98e16275b118dfba73171177008d6970";
|
||||
hash = "sha256-/ZYSiSuEGrbaWU7ZYXQl5ztL5AMGhOkDFyR2ftfEuVw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Sequential object-oriented simPlex";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
mainProgram = "soplex";
|
||||
maintainers = with lib.maintainers; [ david-r-cox ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.59";
|
||||
version = "3.16.63";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gPG7wu3K0wLwpV0nPJt7sIrLP3PrgOS/4POM5zwerVs=";
|
||||
hash = "sha256-PYB4Dns88vYz7Yo3BOrtEez4IGPBvh1SbHECRO8Hfvc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,20 +20,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stoat-desktop";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stoatchat";
|
||||
repo = "for-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Q1FKQBxtlrGmdfx7gLd0aQx/5Pqd4atFdMykxK997Rw=";
|
||||
hash = "sha256-vMXnBniA0wyoK7Pe13h/yHtf8ky59ts4VQb9k7KuUCE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Disable auto-updates
|
||||
substituteInPlace src/main.ts \
|
||||
--replace-fail "updateElectronApp();" ""
|
||||
sed -i '/updateElectronApp([^)]*)/d' src/main.ts
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "stripe-cli";
|
||||
version = "1.31.0";
|
||||
version = "1.37.1";
|
||||
|
||||
# required for tests
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "stripe";
|
||||
repo = "stripe-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fvemd1yo8WOWob/l3TU9lHcFc7OAI/oaX5XEK38vDwo=";
|
||||
hash = "sha256-ItaJ+REOgOeJdeqJ3amZqNK38TssILOOp3ddxiEHS9c=";
|
||||
};
|
||||
vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048=";
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swaybg";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaybg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg=";
|
||||
hash = "sha256-ByocNDqkv1ufN3Rr5yrfGkN5zS+Cw1e8QLQ+5opc1K4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tmuxp";
|
||||
version = "1.56.0";
|
||||
version = "1.64.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-6Nc6JHNZM6OUgoOfpD4wCDUlLAb2kLBplm1IjuVG/q8=";
|
||||
hash = "sha256-jx5duGqxgXqDHfc74mZ6YZlxdW16bYJ3KD5hRReJmCw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transgui";
|
||||
version = "5.18.0-unstable-2024-10-03";
|
||||
version = "5.18.0-unstable-2026-02-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "transmission-remote-gui";
|
||||
repo = "transgui";
|
||||
rev = "8854357ece266e749e8981a93c8002465a93d8f2";
|
||||
hash = "sha256-8ycivjjPeXBdPbqNNlO2hcre6T9sFhqg6vUfCREtd8k=";
|
||||
rev = "da71b860d4920f7ab847a48bd8d804725ddbad7b";
|
||||
hash = "sha256-ZrzC0Pnf4HXC/XqOCzPfhAhfUvuchW2CgX3izfQAALo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,30 +8,30 @@
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
|
||||
rev = "e821bcbecdc997d71766836a200e16b27535a835";
|
||||
# git describe --tags
|
||||
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
|
||||
realVersion = "1.4-12-g${builtins.substring 0 7 rev}";
|
||||
|
||||
main_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis";
|
||||
inherit rev;
|
||||
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
|
||||
hash = "sha256-RyCZTdiF8kFBNGWJnwALjF0fXrZm3OvSM0sdL6ljlYU=";
|
||||
name = "trellis";
|
||||
};
|
||||
|
||||
database_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis-db";
|
||||
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
|
||||
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
|
||||
rev = "015e0330630d7c238c0e4f2cdd9c8157eb78c54a";
|
||||
hash = "sha256-1VpxI0RHZSiWdQPCgsEWQ3hqzy5F1YV7ZOGL3kK18XM=";
|
||||
name = "trellis-database";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "trellis";
|
||||
version = "unstable-2022-09-14";
|
||||
version = "unstable-2025-01-30";
|
||||
|
||||
srcs = [
|
||||
main_src
|
||||
@@ -52,7 +52,6 @@ stdenv.mkDerivation {
|
||||
|
||||
preConfigure = ''
|
||||
rmdir database && ln -sfv ${database_src} ./database
|
||||
|
||||
cd libtrellis
|
||||
'';
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trufflehog";
|
||||
version = "3.93.3";
|
||||
version = "3.93.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mUzfTztg3QG13HrYAa7m6bCZkl9gsPS3Nmqlw4YvueQ=";
|
||||
hash = "sha256-ef6BfZKr0XtNK/vWNIzEzAUnrZX8dRxdFcrEedroZyA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U3pznVPh/nQ4YZ5y94VF+UeISXDaWJ/gTNrY8wqq2gQ=";
|
||||
|
||||
@@ -61,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CFLAGS+=-DHAVE_STRUCT_STAT_ST_CTIM=0"
|
||||
"CFLAGS+=-DHAVE_SYMLINK=0"
|
||||
"CFLAGS+=-DRESERVE_STD_EXT_IDS"
|
||||
# sys/stat.h does exist on Windows for us
|
||||
"CFLAGS+=-DHAVE_SYS_STAT_H=1"
|
||||
# It is called st_ctime on windows, this forces that
|
||||
# choice
|
||||
"CFLAGS+=-DHAVE_STRUCT_STAT_ST_CTIM=0"
|
||||
"CFLAGS+=-DHAVE_MEMPCPY=1"
|
||||
"CFLAGS+=-DHAVE_GETRESUID=0"
|
||||
"CFLAGS+=-DHAVE_GETEUID=0"
|
||||
"CFLAGS+=-DHAVE_FCHMOD=0"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isFreeBSD [
|
||||
"CFLAGS+=-DNETBSD_INSPIRED=0"
|
||||
|
||||
@@ -42,13 +42,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "udisks";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "udisks";
|
||||
tag = "udisks-${finalAttrs.version}";
|
||||
hash = "sha256-G3qE4evcn5gtsd8Lrj6vjxCsAl/2LCdqdtaqLFFadMw=";
|
||||
hash = "sha256-FZr5AhAxvMbaonYIClHgxsoHaGR2nIClK65IEaYxMeA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
let
|
||||
pname = "uhk-agent";
|
||||
version = "9.0.1";
|
||||
version = "9.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-/DgXushqByEbvbQhmzwXIdmaKWEJL40X6HpV6SUKieY=";
|
||||
sha256 = "sha256-4lOyLbz5QIzO9iEyYhE32ujZql2yNQd/EIAv4VOuRlA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -14,25 +14,25 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
|
||||
hash = "sha256-KE2kl3N6zs/snnb/8uNHSvJLp9tdKCqQRpHvAuOuQiQ=";
|
||||
hash = "sha256-8iHGuBaGaSkbQVaDEHcDUMix79O2vLQNaHNPzN9kt/8=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
|
||||
hash = "sha256-eoN8VXN1LfKU7sLN6C5B9Eu2tepcxe0B1gcClVIzdxA=";
|
||||
hash = "sha256-f6vMtvg2B7Ui/fJmEAFRl4SxphbWXIup3dOiOncFYmY=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz";
|
||||
hash = "sha256-x8mP0iZIe9w0bCXHnccGa3kfOMCVq6NZUhnL0hqBl2M=";
|
||||
hash = "sha256-kqqSFYKoP8c8oJaoVwLeFhMIuFY2a1ulUPpZeGV5FMY=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
|
||||
hash = "sha256-JucU3VrCK+cOkbWzPdp7u3LMa+I72y/W2QqOuwFLN3U=";
|
||||
hash = "sha256-8si1oemPDPHdWUGSUXEslih5K6z/cdLijwymN31N2Ng=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/carrotIndustries/usbkvm/releases/download/v${version}/usbkvm-v${version}.tar.gz";
|
||||
hash = "sha256-urexPODXU69QfSRHtJVpoDx/6mbPcv6EQ3mR0VRHNiY=";
|
||||
hash = "sha256-xTBrUI6U6W//Sb1UrIGAWHEeT7LToz7znBW0B4Rs520=";
|
||||
};
|
||||
|
||||
ms-tools-lib = buildGoModule {
|
||||
|
||||
@@ -18,6 +18,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-p0JDeNLKkjmGsZ9fF/9Xm+0pc00pzY8pgWb4B82D6vE=";
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
checkFlags = [
|
||||
# Operation not supported
|
||||
"--skip=common::util::tests::test_compare_xattrs"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user