Merge staging-next into staging
This commit is contained in:
@@ -360,7 +360,7 @@ in
|
||||
${lib.optionalString haveLocalDB ''
|
||||
if ! [ -e ${baseDir}/.db-created ]; then
|
||||
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
|
||||
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
|
||||
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra
|
||||
touch ${baseDir}/.db-created
|
||||
fi
|
||||
echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra
|
||||
|
||||
+6
-32
@@ -1,11 +1,11 @@
|
||||
{ pkgs, ... }:
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "caddy";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
stepbrobd
|
||||
];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
stepbrobd
|
||||
];
|
||||
|
||||
nodes = {
|
||||
webserver =
|
||||
@@ -69,24 +69,6 @@
|
||||
respond "hello world"
|
||||
'';
|
||||
};
|
||||
specialisation.with-plugins.configuration = {
|
||||
services.caddy = {
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ];
|
||||
hash = "sha256-0N/bQAM5yT6g9UAteWsfxofGcelmU/NDTroS2oL43Gs=";
|
||||
};
|
||||
configFile = pkgs.writeText "Caddyfile" ''
|
||||
{
|
||||
order replace after encode
|
||||
}
|
||||
|
||||
localhost:80 {
|
||||
respond "hello world"
|
||||
replace world caddy
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -98,7 +80,6 @@
|
||||
multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
|
||||
multipleHostnames = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-hostnames";
|
||||
rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42";
|
||||
withPluginsConfig = "${nodes.webserver.system.build.toplevel}/specialisation/with-plugins";
|
||||
in
|
||||
''
|
||||
url = "http://localhost/example.html"
|
||||
@@ -141,12 +122,5 @@
|
||||
)
|
||||
webserver.wait_for_open_port(80)
|
||||
webserver.succeed("curl http://localhost | grep hello")
|
||||
|
||||
with subtest("plugins are correctled installed and configurable"):
|
||||
webserver.succeed(
|
||||
"${withPluginsConfig}/bin/switch-to-configuration test >&2"
|
||||
)
|
||||
webserver.wait_for_open_port(80)
|
||||
webserver.succeed("curl http://localhost | grep caddy")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "ppsspp";
|
||||
version = "0-unstable-2026-06-28";
|
||||
version = "0-unstable-2026-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "3b319699318731d6d1900ba4b65e2c8c47774631";
|
||||
hash = "sha256-JcsYRV1T9Fpi7w0MB57IonhOG6CPCcejhx64ls4+Aqw=";
|
||||
rev = "0335e5e6a98a9578a2a2b6a7698905d706e4ca82";
|
||||
hash = "sha256-AE4IZ81Wrjn4g3BY9FEiIGOPQ5vRDUf7Jzo3lLwQqk4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -319,11 +319,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-Myy9UIvKD0W19CGToMjq1iGy4tBVpfACpqgibsKOvac=",
|
||||
"hash": "sha256-r+Bi8F603JE9K4hZDFwuhYtfg3FKYNPP1A7lpvvrZQg=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.92.0",
|
||||
"rev": "v2.95.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -517,13 +517,13 @@
|
||||
"vendorHash": "sha256-COWHnLR6aRwcGJVo6IFvqQLwAYxFpqUGQbZVvEo/b/I="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-IRDNbQh3OouVUKranI962+3f5REeIC5Vtv8dw06z9UE=",
|
||||
"hash": "sha256-z1wns0zuanfoeIb7CDRBtt4CoRQ4+b5PNKpmDbfyHd0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.90.0",
|
||||
"rev": "v1.92.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9FzpBgb3BzIVhx8kqhyDJw/liH6X8jUhFmwtbic4uVw="
|
||||
"vendorHash": "sha256-/kcUQo6hd1TxP6rEoTsll0ZRL2BXdRg8vxIoJ9VmzTs="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-mEYEZIztDjyqWSJFoJPXtV0E9YikumtwGVtZA4Jfw3U=",
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
# overridable. This is useful when the upstream archive was replaced
|
||||
# and nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1230";
|
||||
version = "1234";
|
||||
edition = "";
|
||||
hash = "sha256-/4qKFnLoou1ZuGkRt+2Yf/FPGOnYhx7fnE+8D3gutaY=";
|
||||
hash = "sha256-00bscKt+4aE94x6wKGqXh6tE2GiDll6F4gWZZBEl2JE=";
|
||||
},
|
||||
|
||||
...
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
# Softmaker Office or when the upstream archive was replaced and
|
||||
# nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1230";
|
||||
version = "1234";
|
||||
edition = "2024";
|
||||
hash = "sha256-xaXS22feHbRVPWP43vGbfptoT2S6jLUrGVFQ3xY7SJY=";
|
||||
hash = "sha256-oIO/p52ASIU0qjQqxp/l9GVrUK+LQNQxX1wKheKHT3w=";
|
||||
},
|
||||
|
||||
...
|
||||
|
||||
@@ -304,6 +304,9 @@ buildStdenv.mkDerivation {
|
||||
|
||||
inherit src unpackPhase;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta =
|
||||
meta
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildGoModule,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
nixosTests,
|
||||
caddy,
|
||||
installShellFiles,
|
||||
@@ -10,23 +11,18 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "2.11.4";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oRQfQH1GKjAjVMj+dZo1f1+HOaOdJIyEfod0iGLYcc8=";
|
||||
};
|
||||
in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "caddy";
|
||||
inherit version;
|
||||
version = "2.11.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
# remember to update hashes for `dist` and `plugins` test!
|
||||
hash = "sha256-wzk8KRZfDCbbjRlBwkoKAoMjOhV4xF3yuXUueqtl1xM=";
|
||||
};
|
||||
|
||||
@@ -52,7 +48,7 @@ buildGoModule (finalAttrs: {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
|
||||
install -Dm644 ${finalAttrs.passthru.dist}/init/caddy.service ${finalAttrs.passthru.dist}/init/caddy-api.service -t $out/lib/systemd/system
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/caddy.service \
|
||||
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
|
||||
@@ -72,20 +68,29 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/caddy completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) caddy;
|
||||
acme-integration = nixosTests.acme.caddy;
|
||||
};
|
||||
withPlugins = callPackage ./plugins.nix { inherit caddy; };
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
withPlugins = callPackage ./plugins.nix { inherit caddy; };
|
||||
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oRQfQH1GKjAjVMj+dZo1f1+HOaOdJIyEfod0iGLYcc8=";
|
||||
};
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests) caddy;
|
||||
plugins = testers.runNixOSTest ./plugins.test.nix;
|
||||
acme-integration = nixosTests.acme.caddy;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://caddyserver.com";
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "caddy-plugins";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
stepbrobd
|
||||
];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
|
||||
package = pkgs.caddy.withPlugins {
|
||||
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ];
|
||||
hash = "sha256-oj0IpspxslpNZbJFsexh0W2Sja19XRUsbShoCuY6qkQ=";
|
||||
};
|
||||
|
||||
globalConfig = ''
|
||||
order replace after encode
|
||||
'';
|
||||
|
||||
virtualHosts."localhost:80".extraConfig = ''
|
||||
respond "hello world"
|
||||
replace world nixos
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("caddy")
|
||||
machine.wait_for_open_port(80)
|
||||
machine.succeed("curl http://localhost | grep nixos")
|
||||
'';
|
||||
}
|
||||
@@ -29,13 +29,13 @@
|
||||
libx11,
|
||||
libxshmfence,
|
||||
libxcb,
|
||||
version ? "147.0.10",
|
||||
gitRevision ? "d58e84d",
|
||||
chromiumVersion ? "147.0.7727.118",
|
||||
version ? "149.0.5",
|
||||
gitRevision ? "6770623",
|
||||
chromiumVersion ? "149.0.7827.197",
|
||||
buildType ? "Release",
|
||||
srcHashes ? {
|
||||
aarch64-linux = "sha256-kaRijMDacPcoeCcS31zmRSNOvgozx+uq2M34mD28bu4=";
|
||||
x86_64-linux = "sha256-CHzPofBDhCniDZEpOxXK4I7p57SYjMAY1HVo3Vna0e8=";
|
||||
aarch64-linux = "sha256-cBAvcvs1rAg5EKJkCt81RZYupCWpUNIC/nLt3PJow7Q=";
|
||||
x86_64-linux = "sha256-OPGMBJmvvLiLdBDniBQwx7LmTGGI59AcesJdILSeqcs=";
|
||||
},
|
||||
}:
|
||||
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cnspec";
|
||||
version = "13.27.4";
|
||||
version = "13.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HcDGHcKxbXYTF+PdrjcOcCH/0Hnz++qIGdbDYtCRpDM=";
|
||||
hash = "sha256-9AlHvxWdmJIdfvmok9n+6g0k5A4Rts2+G5pO9xbYWSQ=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-suSEjRh6vSSI2jRyz12nLD/G1gvQiWC4aGx2J2drSIo=";
|
||||
vendorHash = "sha256-LTzg76RQOV0d3Xk4Q8NvBnmTQv4QhJutNoJPw0gCCII=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -71,11 +71,11 @@ in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "copyparty${nameSuffix}";
|
||||
version = "1.20.16";
|
||||
version = "1.20.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz";
|
||||
hash = "sha256-Yl+V1l2VzdaJhRBRjQE5BeZ2bH0q4Oqa59XeyW6J4C0=";
|
||||
hash = "sha256-lJVTrv/qlCoN2r0+EtKKZD/qhi14kwuzbgrMxmxMlHU=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ncurses,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "cpond";
|
||||
version = "0-unstable-2025-11-23";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayuzur";
|
||||
repo = "cpond";
|
||||
rev = "b6d2827c73080b144ff07a70ec61757baff6a73b";
|
||||
hash = "sha256-feRGJ2CIa82eEiGG65WwFlh6dhhIvhW70FJMObWvi1Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '$(eflags)$(ncursesw_macros)' '$(eflags) $(ncursesw_macros)'
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '-lncursesw' '-lncurses'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp cpond $out/bin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ayuzur/cpond";
|
||||
description = "Procedurally animated fish for your terminal";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "cpond";
|
||||
maintainers = with lib.maintainers; [ yarn ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -38,6 +40,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
# TODO: Upstream also provides Elvish and PowerShell completions,
|
||||
# but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment.
|
||||
installShellCompletion --cmd dua \
|
||||
--bash <($out/bin/dua completions bash) \
|
||||
--fish <($out/bin/dua completions fish) \
|
||||
--zsh <($out/bin/dua completions zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2026-07-08";
|
||||
version = "2026-07-09";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5hRjsBHElDFzWwhFxEo254AgUbg2qYu3ekyNoGSqJMA=";
|
||||
hash = "sha256-V9hRNS5F6XovML9coPqSq1letp67THqqocqKYWJtFkQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "15.3.1";
|
||||
version = "15.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SjRs4ZJnjRTfMgoMBoDoHImD6M6FO6QRA0Vmth1GFbI=";
|
||||
hash = "sha256-vC3S3PYLtkbobfqUSdgrxcfFxHWN02mEO3YzctMkybU=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-zQ+ZJ4LXV9NR2zwcMrTTc3eWpNxrbFlik2m2CpaE3eA=";
|
||||
vendorHash = "sha256-8TM/gprIgItjw9rUAHh6eJ8ZHlbUoB5KyKmFJDM2xlU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fulcio";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "fulcio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9TvucbTD2uPFxJqUG2EwMLRV6PxGf5UbxoEIUAqUE84=";
|
||||
hash = "sha256-MKXJAk4N6Q/VM7/8Ri08rfrxHRw5FvOoreFrMp2SoE0=";
|
||||
# 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;
|
||||
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-Mb4MBqEbWAo58TLd15JUh53I7CUHu+nyyIAfZxx3DMw=";
|
||||
vendorHash = "sha256-Bpu6PR3i+Sq5tZhCPLYi4rECwZ/QiN3Wls7U+8f6fBU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -29,12 +29,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0-unstable-2026-06-23";
|
||||
rev = "ebbbb6bd1b0add39969717d18563808cc6306a63";
|
||||
version = "0-unstable-2026-07-01";
|
||||
rev = "95c1ab81f31f318a9e344d1d229feacff861ad39";
|
||||
|
||||
srcHash = "sha256-8k30s/czdJ5uNHH75K4+XJo6Ncd1GA3NSlaa7yO4+mg=";
|
||||
srcHash = "sha256-0GNoGD0S3YrHAaJ/aPNyVG6SfFi1h1NyTR1xmvd5+DQ=";
|
||||
shaderHash = "sha256-4lKBrGh1rfhTBczmCDvIF2KxLyEHzHdKVGgQ+jLd/Dw=";
|
||||
cargoHash = "sha256-gpv4LZHEWKonQodW/uzdoAfkaxSRuCMKyX1SSit/gEQ=";
|
||||
cargoHash = "sha256-1KZsh4M+ijd5LcoELzW9sGsuC+91XBamimvw0AXIgNU=";
|
||||
npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks=";
|
||||
|
||||
brandingRev = "0d004aa61e6b48d316e8e5db6d59ccc4788f192d";
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kingfisher";
|
||||
version = "1.102.0";
|
||||
version = "1.106.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "mongodb";
|
||||
repo = "kingfisher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ksTpxjBGYfZIFx93O0Wa+Z4qbLdur+5oETWHiH6BiNM=";
|
||||
hash = "sha256-HzS+ZNulmrhDstxleUztNhAscZZ5VqrBlzozH12Qz40=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+m7rDZvR1nJmNj1IPydQdMq+/Xl7yVdrUO42BxRmkQY=";
|
||||
cargoHash = "sha256-F5RgsrCWDkaLm+/5DsSQ3NMtPi6+e0oddHm+KhY2gNQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -45,6 +45,8 @@
|
||||
makeBinaryWrapper,
|
||||
darwin,
|
||||
cairo,
|
||||
# TODO: Clean up on `staging`.
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
@@ -117,6 +119,8 @@ buildPythonApplication rec {
|
||||
imagemagick
|
||||
libicns # For the png2icns tool.
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
# TODO: Clean up on `staging`.
|
||||
llvmPackages.lld
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland-scanner
|
||||
@@ -153,6 +157,10 @@ buildPythonApplication rec {
|
||||
CGO_ENABLED = 0;
|
||||
GOFLAGS = "-trimpath";
|
||||
GOTOOLCHAIN = "local";
|
||||
}
|
||||
# TODO: Clean up on `staging`.
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubexporter";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bakito";
|
||||
repo = "kubexporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sAY7nm+BaNOoPNmMDWVqJrzMSFnah8z6bKiGQrX1/+k=";
|
||||
hash = "sha256-PD/mvjL5Xp7gAs3iIz8nhsW7cpenFyzYiEXHE/zmur4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-I6FBS8VnH4p9aZgJd1/dDf1xVJ3+PBhqkePZKTMuEJo=";
|
||||
vendorHash = "sha256-FToKA1Zu8wj5CudxYmtggvBZmuQLYWWg2taswPnMuDA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "libfrida-core";
|
||||
version = "17.15.3";
|
||||
version = "17.15.4";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
|
||||
@@ -29,19 +29,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-x86_64.tar.xz";
|
||||
hash = "sha256-cZKRmpJKv5I8Bjdi44vkRT424Lx8X71E8suHMJRKMVg=";
|
||||
hash = "sha256-VzPu6AYN8LVQULJBb4Ug7GrenyklksORpcZoj9Sg354=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz";
|
||||
hash = "sha256-av/exxhssyZgvLvlJsvxqTOymRLNu5eXl8zTv1rsLN0=";
|
||||
hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-x86_64.tar.xz";
|
||||
hash = "sha256-slmk8Zbk329pMscVWPXOi9G793wXquFuVBWLH2yuiYE=";
|
||||
hash = "sha256-x76PBEkQ7j1nIHucxV/BCmmOfRhiJUiCXGQk/Iw7KTE=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz";
|
||||
hash = "sha256-X65oBfz/yC92CHVIOg5ZAZwlAMgUQ/6MpBfi5uBLirg=";
|
||||
hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-libfrida-core" ''
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "linux-exploit-suggester";
|
||||
version = "unstable-2022-04-01";
|
||||
pname = "937cf955501fe7da85994c98f0ca6151194e7c1d";
|
||||
version = "1.2-unstable-2026-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "The-Z-Labs";
|
||||
repo = "linux-exploit-suggester";
|
||||
rev = "54a5c01497d6655be88f6262ccad5bc5a5e4f4ec";
|
||||
sha256 = "v0Q8O+aaXEqwWAwGP/u5Nkm4DzM6nM11GI4XbK2PeWM=";
|
||||
rev = "937cf955501fe7da85994c98f0ca6151194e7c1d";
|
||||
hash = "sha256-a6SS1GS0qc1BW0w9Er8LA7K4pRMYnfHtmjUNwBF5Gtg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Tool designed to assist in detecting security deficiencies for given Linux kernel/Linux-based machine";
|
||||
mainProgram = "linux-exploit-suggester";
|
||||
homepage = "https://github.com/The-Z-Labs/linux-exploit-suggester";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ emilytrau ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "linux-exploit-suggester";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -40,17 +40,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
glib
|
||||
gobject-introspection
|
||||
gdk-pixbuf
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
vulkan-loader
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
doCheck = false; # there are no cli tests
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"lockbook-linux"
|
||||
"lockbook-desktop"
|
||||
];
|
||||
|
||||
desktopItems = makeDesktopItem {
|
||||
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/lockbook-linux $out/bin/lockbook-desktop
|
||||
install -D docs/graphics/logo.svg $out/share/icons/hicolor/scalable/apps/lockbook.svg
|
||||
'';
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ index 93cb8ab263..3d12cd5e54 100644
|
||||
);
|
||||
};
|
||||
diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss
|
||||
index c2e6fbd187..828955cc79 100644
|
||||
index c2e6fbd187..bc1cedcff1 100644
|
||||
--- a/channels/src/components/header_footer_route/header.scss
|
||||
+++ b/channels/src/components/header_footer_route/header.scss
|
||||
@@ -47,20 +47,7 @@
|
||||
@@ -36,6 +36,19 @@ index c2e6fbd187..828955cc79 100644
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,12 +70,6 @@
|
||||
margin-top: 12px;
|
||||
}
|
||||
}
|
||||
-
|
||||
- &.has-free-banner.has-custom-site-name {
|
||||
- .header-back-button {
|
||||
- bottom: -20px;
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
@media screen and (max-width: 699px) {
|
||||
diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss
|
||||
index dee9b57f8c..8ef4aa073a 100644
|
||||
--- a/channels/src/components/widgets/menu/menu_items/menu_item.scss
|
||||
@@ -57,7 +70,7 @@ index dee9b57f8c..8ef4aa073a 100644
|
||||
button {
|
||||
padding: 3px 0;
|
||||
diff --git a/channels/webpack.config.js b/channels/webpack.config.js
|
||||
index 852046de70..cf28fdcbd6 100644
|
||||
index 852046de70..a310da48f4 100644
|
||||
--- a/channels/webpack.config.js
|
||||
+++ b/channels/webpack.config.js
|
||||
@@ -470,6 +470,9 @@ if (targetIsDevServer) {
|
||||
|
||||
@@ -1,8 +1,19 @@
|
||||
diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
|
||||
index 4c88c1f049..fb7d84ef05 100644
|
||||
index 45448e4b2b..6125c02baf 100644
|
||||
--- a/server/channels/app/limits.go
|
||||
+++ b/server/channels/app/limits.go
|
||||
@@ -18,23 +18,8 @@ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
- maxUsersLimit = 200
|
||||
- maxUsersHardLimit = 250
|
||||
+ maxUsersLimit = 10000000
|
||||
+ maxUsersHardLimit = 10000000
|
||||
)
|
||||
|
||||
// GetServerLimits returns the server's seat/post-history limits. The license-derived
|
||||
@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod
|
||||
limits := &model.ServerLimits{}
|
||||
license := a.License()
|
||||
|
||||
@@ -28,11 +39,11 @@ index 4c88c1f049..fb7d84ef05 100644
|
||||
|
||||
// Check if license has post history limits and get the calculated timestamp
|
||||
if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 {
|
||||
@@ -99,14 +84,5 @@ func (a *App) GetPostHistoryLimit() int64 {
|
||||
@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 {
|
||||
}
|
||||
|
||||
func (a *App) isAtUserLimit() (bool, *model.AppError) {
|
||||
- userLimits, appErr := a.GetServerLimits()
|
||||
- userLimits, appErr := a.GetServerLimits(true)
|
||||
- if appErr != nil {
|
||||
- return false, appErr
|
||||
- }
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
#
|
||||
# Ensure you also check ../mattermostLatest/package.nix.
|
||||
regex = "^v(11\\.7\\.[0-9]+)$";
|
||||
version = "11.7.4";
|
||||
srcHash = "sha256-kO4ntGffvMis7JFZLMpnPdjotPiZ/kJcxeKoMjXAZ3U=";
|
||||
version = "11.7.6";
|
||||
srcHash = "sha256-oMjfSX45+sEQwNpNVDTOlCBUK7OSBCCKpaUMMrRzdQM=";
|
||||
vendorHash = "sha256-XaXqQN20c3DhW2/L0zhTA8dLeRp4MyBxUKpiMVwp/7s=";
|
||||
npmDepsHash = "sha256-lqgYZAGCjChGwBKACKKiMRzI2WP0ByanMMIVxo/h8t8=";
|
||||
npmDepsHash = "sha256-F7o+AVM1WiuHKDQaqHbxDjWT1vAiddh4/D8EktxncAs=";
|
||||
},
|
||||
...
|
||||
}:
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-git";
|
||||
version = "2026.6.16";
|
||||
version = "2026.7.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "servers";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-n8l4E6S4d19GQnKWO1y2De1SuHa/R8UGlb/GMR4dbMw=";
|
||||
hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/git/";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-time";
|
||||
version = "2026.6.16";
|
||||
version = "2026.7.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "servers";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-n8l4E6S4d19GQnKWO1y2De1SuHa/R8UGlb/GMR4dbMw=";
|
||||
hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/time/";
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mkvtoolnix";
|
||||
version = "99.0";
|
||||
version = "100.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-re4z0ZseuOP/P1HW3qdWLIo+YhLlSRBuqefewRm6KEI=";
|
||||
hash = "sha256-85mL3/x7SoTgOxU/YCFh58vcGzHLG3qPbbG4MD5dB9o=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mqattack";
|
||||
version = "0.1.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "affolter-engineering";
|
||||
repo = "mqattack";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kUZatTjjpBpyrZ//JHDSki6oXVGunH0thgY0+q3wFyM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-V1RKag4AZhYaTY9vzt56F19qMAAt3BTdAliu1uKbVwQ=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "MQTT penetration testing tool";
|
||||
homepage = "https://github.com/affolter-engineering/mqattack";
|
||||
changelog = "https://github.com/affolter-engineering/mqattack/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "mqattack";
|
||||
};
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nerva";
|
||||
version = "1.37.1";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "nerva";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gBPZSrXAm7DPxeO//To97sNyovCEJdYoaa4viCvLPME=";
|
||||
hash = "sha256-7d6sib2nr1LZty3KRRAhvrOIVQr2KFQTvtoHNmte4Kc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "openmeters";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "httpsworldview";
|
||||
repo = "openmeters";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b1Nq+eZJ/87bOygIfU+BK7t0xu9HSBhWmFU1Fmv11vo=";
|
||||
hash = "sha256-gtrX9MPZFUy+cMk4MPTNL2+QmORZ9rJ9WEivALgiy5M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cAYnHeAHEAiovibyKeDB5T74FWfT0ndOI2MtOZC0dVE=";
|
||||
cargoHash = "sha256-LNELcHA45EEtdwW9iMQqtD0aVA/8Q69xdo+GXklTkQc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -44,14 +44,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pacman";
|
||||
version = "7.1.0";
|
||||
version = "7.1.0-unstable-2026-01-25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.archlinux.org";
|
||||
owner = "pacman";
|
||||
repo = "pacman";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bGg2ZrIsEYJYZCLsIh4FZROhpyLSBO0Lar1mSoz66wI=";
|
||||
rev = "cb7452f63414291b52061166ab2ebf1083897917";
|
||||
hash = "sha256-ocynGQ1oIeaQgLlCTCrxq/ihxziDMqrIPKAJThvV7SE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pinocchio";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = "pinocchio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9UnMGrs4mvBYfjmwOprhqStRW/liPrsKFabRFE2xmjo=";
|
||||
hash = "sha256-wWuW58okWARbF/nonybw3DbGY4hrHDiEsdjiF6RoaVc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "prometheus-nvidia-gpu-exporter";
|
||||
version = "1.6.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = "nvidia_gpu_exporter";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KMXdKUBHL6Fq4GQC5paDqn9vb4/KBMcfq4c1njhGi6o=";
|
||||
hash = "sha256-dE5ERAOocAJnYjWmF057ifPBhDGK41p7cGl+rX2IzRg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QG2Pcg+RwnGMBcDMjaFEROTDTr39J0oGJplO7vPvXYk=";
|
||||
vendorHash = "sha256-6eX+SVm6+/NWuNRD2MkJaDNi9YwJnojx9Df+o1km88I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
kingfisher,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "prowler";
|
||||
version = "5.31.1";
|
||||
version = "5.33.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -15,11 +16,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "prowler-cloud";
|
||||
repo = "prowler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-V3kPj3gtS8ZkeU/rBaTPaOdfWvYI70jAi52kCX0m/jg=";
|
||||
hash = "sha256-dx4/AmV+K4YH9gqjznMNJcVv0MZ5Qt/Lelw6ErbHgt8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonRemoveDeps = [ "kingfisher-bin" ];
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
@@ -107,6 +110,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
uuid6
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/prowler --prefix PATH : "${lib.makeBinPath [ kingfisher ]}"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "prowler" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pspy";
|
||||
version = "1.2.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dominicbreuker";
|
||||
repo = "pspy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7R4Tp0Q7wjAuTDukiehtRZOcTABr0YTnvrod9Jdwjok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mgAsy2ufMDNpeCXG/cZ10zdmzFoGfcpCzPWIABnvJWU=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
"-X=main.commit=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Monitor linux processes without root permissions";
|
||||
homepage = "https://github.com/dominicbreuker/pspy";
|
||||
changelog = "https://github.com/dominicbreuker/pspy/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "pspy";
|
||||
};
|
||||
})
|
||||
@@ -1,8 +1,8 @@
|
||||
{ radicle-node }:
|
||||
|
||||
radicle-node.override {
|
||||
version = "1.9.1";
|
||||
srcHash = "sha256-8wLVNHF9qkKBK2s6RdH0/2To2zamx8RON5iBjkQoQY4=";
|
||||
cargoHash = "sha256-holYrCL0FApbnFRj0+bVnjkiNL14jclaM8xIqRHfEkc=";
|
||||
version = "1.10.0-rc.1";
|
||||
srcHash = "sha256-20dW6KcbeB6Xi5aWsIfV71CtEj37LIUpKbFWMjMF+g8=";
|
||||
cargoHash = "sha256-cmsunitIfD6guWI1tIJCrL5WRHJDfmEO3+Xs4bv6IOw=";
|
||||
updateScript = ./update-unstable.sh;
|
||||
}
|
||||
|
||||
@@ -16,13 +16,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "sddm-astronaut";
|
||||
version = "0-unstable-2026-06-17";
|
||||
version = "0-unstable-2026-07-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keyitdev";
|
||||
repo = "sddm-astronaut-theme";
|
||||
rev = "cd46736b4135a71700d2225d60eb8e85917585eb";
|
||||
hash = "sha256-5ys3pP5GgkrIua/4II8KiQbWCwK8PZK6Sj3lCMe9q1c=";
|
||||
rev = "292c87b770ff9eab1903dd2c6ddff466faf87fb0";
|
||||
hash = "sha256-O/EMJc1j2TRF3W+vuurzA9j5eG1OXSjGFrYxQbp99KU=";
|
||||
};
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sdl-jstest";
|
||||
version = "0.2.2-unstable-2025-11-28";
|
||||
version = "0.2.2-unstable-2026-07-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Grumbel";
|
||||
repo = "sdl-jstest";
|
||||
rev = "c3bb98945be0c6cb4ef54e9bbc1647a2b1bb4a6c";
|
||||
hash = "sha256-1+8KkQj8mHkPP2lsMR3vl38FuphRTseL356/KBsFzfw=";
|
||||
rev = "b8eae565aefa8f1723eb0a64be94de309525d204";
|
||||
hash = "sha256-kS1FcoRUInVkksI2SKQ5oCnEYSZzpf3X+db1KmRzJwI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "spacetimedb";
|
||||
version = "2.7.0";
|
||||
version = "2.7.0-hotfix1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clockworklabs";
|
||||
repo = "spacetimedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J3W0TfsdRommVZuluJSG9xma27gH7niOsLG5t8Lpsew=";
|
||||
hash = "sha256-71/pt3OmjtGJboGIqACDQ6GwELHnS2Zs+8kD7IrIcmg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gi62QoXDCZxGponQrnwaPOiNLnUSBeeETRtYWkzxI1s=";
|
||||
cargoHash = "sha256-KfgSYXHQprIX5BVvHWpTKaJg+h8TQkiW0HVjCXttIeQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "speakeasy-cli";
|
||||
version = "1.786.1";
|
||||
version = "1.789.0";
|
||||
|
||||
sourceRoot = ".";
|
||||
src =
|
||||
@@ -33,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip";
|
||||
hash = "sha256-87s2NTkbPEHVKv5zV0FWxkyjF9KtOtThI3KdEl/fJiY=";
|
||||
hash = "sha256-ZXTD4rZUTg7JBnoloHs0gysUHTmgxJotrP/70PYfAB8=";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip";
|
||||
hash = "sha256-T+e279QDXJH1H2XZLnW5n0GqgFkJmvL1KZdNGaQ88jA=";
|
||||
hash = "sha256-8QEtlte0PtbCVZjvcBd16zJf3weVju5nsS+PrDCMMl8=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_arm64.zip";
|
||||
hash = "sha256-FHkNermrMcYw3G91t88sOZroaS95ztp9sTZuvZpWzAQ=";
|
||||
hash = "sha256-UC9YUPKeUoe1C9x5sK6mO7BXBNQTYkvyKi42L3q3/Eg=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_arm64.zip";
|
||||
hash = "sha256-pAt18QB7wjli+JN1oHckki4QdQTcWwxGkC72QJ5fnn0=";
|
||||
hash = "sha256-V4e6tZWd1iqpOeVbgefIlHxWuWjRVqS3zSY62FJwOF8=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-speakeasy" ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "src-cli";
|
||||
version = "7.4.0";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "src-cli";
|
||||
rev = version;
|
||||
hash = "sha256-AJe/Xmc5HQ47voMBVjGLuxuugm5Y+yWDP9NwlzMg51s=";
|
||||
hash = "sha256-4E4ph++YP3c3+edmLHTGTGybKpiVoAzbehOmhYglzpo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cr5KUYuEDlahkz2DwTD2yw+Tl/QrTP2O6b1HzQqXnzE=";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vcard-viewer";
|
||||
version = "0.1.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "affolter-engineering";
|
||||
repo = "vcard-viewer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QJSAp8JZZfg22TYBDfstL5V4e8sAOAp6OEvjCSvGtc0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-D2XR3cGmj3xZS49sRvKwCRXDAPEAK9MWAciMxfixrTY=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Command-line vCard tool that parses and displays vCards";
|
||||
homepage = "https://github.com/affolter-engineering/vcard-viewer";
|
||||
changelog = "https://github.com/affolter-engineering/vcard-viewer/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "vcard-viewer";
|
||||
};
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "versatiles";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zdp64/uODLwGI6nyIr2ImTcwCSxTENe1p+7Rg24CKeI=";
|
||||
hash = "sha256-ZOAEdum6Zq4Qn0WvfFkiSW07aykT1OS38BxuS2Yf58A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AbBhYqD9YK3O0qLxtESTnFfWzwjMlM90aAh3M98gP3M=";
|
||||
cargoHash = "sha256-J/DyJwWMMa8qaw5M5ZX2jzqt2AGyhLgp20h8gD18bKg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evisum";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "dc7m5o7xIEPacBH1Zo+bb7MLgEidRjPwlB0U63B2/w4=";
|
||||
sha256 = "I0h2g8+y5MrYfkgbL5iI+CegvU2UgF0KoArOHu611lQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
click,
|
||||
paho-mqtt,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "arwn-client";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sdague";
|
||||
repo = "arwn-client";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-By4dZlzR3It4UkYss+RPsKt9Easkegv6VbLd0SSaC2U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
paho-mqtt
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "arwn_client" ];
|
||||
|
||||
meta = {
|
||||
description = "Python client library for parsing ARWN weather station MQTT messages";
|
||||
homepage = "https://github.com/sdague/arwn-client";
|
||||
changelog = "https://github.com/sdague/arwn-client/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "arwn-client";
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
})
|
||||
@@ -23,6 +23,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
rm -rf docs
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "click_threading" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
ftfy,
|
||||
packaging,
|
||||
regex,
|
||||
setuptools,
|
||||
setuptools_80,
|
||||
torch,
|
||||
torchvision,
|
||||
tqdm,
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ setuptools_80 ];
|
||||
|
||||
dependencies = [
|
||||
ftfy
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "httpx-retries";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "will-ockmore";
|
||||
repo = "httpx-retries";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LElTcIWNsb2AVbk3dXcCnXeB8JhyM7Y64nTZGZWlVm8=";
|
||||
hash = "sha256-9AQqyveBAqD159J1VhIhp8GrZJLQhJ22A5cFjpaa7o0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202607071";
|
||||
version = "0.1.202607081";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gz2PMoEWE2+xUCfcmr8nI1AFTpKoEdrpuhD3HVoD4qM=";
|
||||
hash = "sha256-5bVmdhbO2Gv4CvkZDGR/k4j9S8+vlTJXPI4hyVnyb54=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
-2312
File diff suppressed because it is too large
Load Diff
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kornia-rs";
|
||||
version = "0.1.10";
|
||||
version = "0.1.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kornia";
|
||||
repo = "kornia-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rC5NqyQah3D4tGLefS4cSIXA3+gQ0+4RNcXOcEYxryg=";
|
||||
hash = "sha256-xzJkuWhSQe5V+I4dKNoGflbt7cARewtEbTdJ3YY+cm8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,15 +33,15 @@ buildPythonPackage rec {
|
||||
nasm # Only for dependencies.
|
||||
];
|
||||
|
||||
cargoRoot = "kornia-py";
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
hash = "sha256-hnvPKm0ul1IXKFtVe1j0D6ogXQ44wpDFpeWn/p5ZKeA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} kornia-py/Cargo.lock
|
||||
'';
|
||||
|
||||
maturinBuildFlags = [
|
||||
"-m"
|
||||
"kornia-py/Cargo.toml"
|
||||
@@ -55,16 +55,16 @@ buildPythonPackage rec {
|
||||
torch
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires apriltag-imgs submodule
|
||||
"test_apriltag_decoder"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kornia/kornia-rs";
|
||||
description = "Python bindings to Low-level Computer Vision library in Rust";
|
||||
changelog = "https://github.com/kornia/kornia-rs/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ chpatrick ];
|
||||
badPlatforms = [
|
||||
# error: could not compile `kornia-3d` (lib)
|
||||
# error: rustc interrupted by SIGSEGV
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "weatherflow4py";
|
||||
version = "1.5.4";
|
||||
version = "1.5.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeeftor";
|
||||
repo = "weatherflow4py";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4Bzoj3SABuziJdbDlDMcbAzGVRRBg5an5Lexlfq9vdw=";
|
||||
hash = "sha256-8uGdgNWjUPOtR3lLt6VhWZSH/wcATlL8l1ILPm8d5jQ=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -417,8 +417,9 @@
|
||||
"arwn" =
|
||||
ps: with ps; [
|
||||
aiohasupervisor
|
||||
arwn-client
|
||||
paho-mqtt
|
||||
]; # missing inputs: arwn-client
|
||||
];
|
||||
"aseko_pool_live" =
|
||||
ps: with ps; [
|
||||
aioaseko
|
||||
@@ -7847,6 +7848,7 @@
|
||||
"aranet"
|
||||
"arcam_fmj"
|
||||
"arve"
|
||||
"arwn"
|
||||
"aseko_pool_live"
|
||||
"assist_pipeline"
|
||||
"assist_satellite"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "basnijholt";
|
||||
domain = "adaptive_lighting";
|
||||
version = "1.30.1";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "basnijholt";
|
||||
repo = "adaptive-lighting";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pmI0jZxIjSiA9P5+0hRCujHE53WprvkAo6jp/IOpJ88=";
|
||||
hash = "sha256-L00M+74ZgJmUje5c/TBkBlsjCrqPt7i/8hH8SU5cnRc=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -1347,6 +1347,8 @@ self: super: with self; {
|
||||
|
||||
arviz-stats = callPackage ../development/python-modules/arviz-stats { };
|
||||
|
||||
arwn-client = callPackage ../development/python-modules/arwn-client { };
|
||||
|
||||
arxiv = callPackage ../development/python-modules/arxiv { };
|
||||
|
||||
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };
|
||||
|
||||
Reference in New Issue
Block a user