Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-09-05 12:07:20 +00:00
committed by GitHub
147 changed files with 1574 additions and 9776 deletions

View File

@@ -82,6 +82,8 @@ let
nativeBuildInputs = with pkgs; [
kubernetes-helm
cacert
# Helm requires HOME to refer to a writable dir
writableTmpDirAsHomeHook
];
}
''

View File

@@ -27,6 +27,9 @@ let
cfg.openTelemetry.grpcURL != null
) "--otel-grpc-url='${cfg.openTelemetry.grpcURL}'")
))
++ (lib.optionals cfg.prometheus.enable [
"--prometheus-enabled"
])
);
serveFlags = lib.concatStringsSep " " (
@@ -34,6 +37,7 @@ let
"--cache-hostname='${cfg.cache.hostName}'"
"--cache-data-path='${cfg.cache.dataPath}'"
"--cache-database-url='${cfg.cache.databaseURL}'"
"--cache-temp-path='${cfg.cache.tempPath}'"
"--server-addr='${cfg.server.addr}'"
]
++ (lib.optional cfg.cache.allowDeleteVerb "--cache-allow-delete-verb")
@@ -76,6 +80,8 @@ in
};
};
prometheus.enable = lib.mkEnableOption "Enable Prometheus metrics endpoint at /metrics";
logLevel = lib.mkOption {
type = lib.types.enum logLevels;
default = "info";
@@ -165,6 +171,14 @@ in
empty to automatically generate a private/public key.
'';
};
tempPath = lib.mkOption {
type = lib.types.str;
default = "/tmp";
description = ''
The path to the temporary directory that is used by the cache to download NAR files
'';
};
};
server = {
@@ -214,7 +228,7 @@ in
};
users.groups.ncps = { };
systemd.services.ncps-create-datadirs = {
systemd.services.ncps-create-directories = {
description = "Created required directories by ncps";
serviceConfig = {
Type = "oneshot";
@@ -232,6 +246,12 @@ in
mkdir -p ${dbDir}
chown ncps:ncps ${dbDir}
fi
'')
+ (lib.optionalString (cfg.cache.tempPath != "/tmp") ''
if ! test -d ${cfg.cache.tempPath}; then
mkdir -p ${cfg.cache.tempPath}
chown ncps:ncps ${cfg.cache.tempPath}
fi
'');
wantedBy = [ "ncps.service" ];
before = [ "ncps.service" ];
@@ -273,6 +293,9 @@ in
(lib.mkIf (isSqlite && !lib.strings.hasPrefix "/var/lib/ncps" dbDir) {
ReadWritePaths = [ dbDir ];
})
(lib.mkIf (cfg.cache.tempPath != "/tmp") {
ReadWritePaths = [ cfg.cache.tempPath ];
})
# Hardening
{

View File

@@ -1,4 +1,5 @@
# Tests whether container images are imported and auto deploying Helm charts work
# Tests whether container images are imported and auto deploying Helm charts,
# including the bundled traefik, work
import ../make-test-python.nix (
{
k3s,
@@ -64,7 +65,6 @@ import ../make-test-python.nix (
"--disable local-storage"
"--disable metrics-server"
"--disable servicelb"
"--disable traefik"
];
images = [
# Provides the k3s Helm controller
@@ -148,6 +148,8 @@ import ../make-test-python.nix (
assert hello_output.rstrip() == "Hello, world!", f"unexpected output of hello job: {hello_output}"
assert values_file_output.rstrip() == "Hello, file!", f"unexpected output of values file job: {values_file_output}"
assert advanced_output.rstrip() == "advanced hello", f"unexpected output of advanced job: {advanced_output}"
# wait for bundled traefik deployment
machine.wait_until_succeeds("kubectl -n kube-system rollout status deployment traefik", timeout=180)
'';
}
)

View File

@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2025-08-03";
version = "0-unstable-2025-09-04";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "935b33b892b55ab5e12a093795a6563af9eacb78";
hash = "sha256-19ehYyVOnYg3b1cvuznYn3zB9rhp2xULKhdFN/FKE4U=";
rev = "a1c81ef494d2ac7a136b330edecbe855fb38b18a";
hash = "sha256-jMJCEoSQi1svbXLyKc4+TRubw7zDpqeql0pstaLs7O4=";
};
hardeningDisable = [ "format" ];

View File

@@ -37,14 +37,14 @@
stdenv.mkDerivation rec {
pname = "mame";
version = "0.279";
version = "0.280";
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${srcVersion}";
hash = "sha256-EMb2GK/9KBvZw3HqZwLeqzmQLpgIzJocipzR+F3vUMg=";
hash = "sha256-+bXohqzecHvXt9DKPbBBQoq9RX/LPX0O6kJf64wIrW8=";
};
outputs = [

View File

@@ -1,10 +0,0 @@
{
traefik-crd = {
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
};
traefik = {
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
};
}

View File

@@ -1,26 +0,0 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.gz",
"sha256": "f98a57f7b25a4537096fbe9755f96cfd05bfe6fc6315f111c0f44e1abf4aad6d"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst",
"sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.gz",
"sha256": "33df3a2b155118198c48e66426a04292a348aa53fef126a3cb8e4fe7aea83ccc"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst",
"sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.gz",
"sha256": "bba9c2e417ece797a5ae8bf9346bb35dc8ab163828c801a2cb512d6097610b52"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst",
"sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452"
}
}

View File

@@ -1,15 +0,0 @@
{
k3sVersion = "1.30.14+k3s2";
k3sCommit = "071b1ead43641c6803e0b9fce6473baeb12357cf";
k3sRepoSha256 = "0lldw9kgzpr1073zsr5y4jxmh1c8ah4giyxzb10rfcwx06mglmir";
k3sVendorHash = "sha256-qEvdBT3noOtKdIdHDJZChowXzQMpVpY/l1ioTJCGVJ4=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.7.1-k3s1";
k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
containerdVersion = "1.7.27-k3s1";
containerdSha256 = "1w6ia9a7qs06l9wh44fpf1v2ckf2lfp9sjzk0bg4fjw5ds9sxws0";
criCtlVersion = "1.29.0-k3s1";
}

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "fa4f87e7e82c0e613f854eedf8f64d2cdabbd127f3ae84707ed1ca59e2137855"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "a6899f064a179d0681b5e18f5b82fa10120badf8e74c79a4eedebe000a9eaa56"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "d253cfce051c549a3ed0826d60e5c7bec7bbd9f8a64f98a9d5ec8238e9914cc3"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "0b6009407069fdd684d9627c5fa4bdb31ea4644172f1f429a2cce15d2c18631d"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "74e897222e53a2750b3ee8249964e0e47fa5c5caae9d611a18499be6b51cdee3"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "162a158c191591ec4ca3b7f446fdf9e23eb8366407091b992087abdc6349325f"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "6fa41db4ee001c1db8a404dd38f17f2426f27f688f9f7a2a76f4ef336f51c886"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "313e268ab348dd8d4708928e7bc0fb45b7f518aeb7dfaa9631d3d7d61ba1f8be"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "60f19d4935f5b4b2b776c634eb9701268b94ccd100fc9c2968c096ba1fb5154f"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.31.11+k3s1";
k3sCommit = "17cfde1c82427535f0d3b6fe15caef1a0e62e82f";
k3sRepoSha256 = "17dmk8r1rjv2wv4kfyrsdyb9xp696ckq79lzjkvh89x8g31b6p1h";
k3sVendorHash = "sha256-ogyFEWnTBYjpz9clO3v5DyO23mHPhUS+JC587kLJ5Ck=";
k3sVersion = "1.31.12+k3s1";
k3sCommit = "2b53c7e4c81742fbb2b0e7e90e3bb907d1fe0e24";
k3sRepoSha256 = "07pi1vjpm01q2riq0dic6p27nqj4wzwwzllxgmr7gfim1xx643gd";
k3sVendorHash = "sha256-osqhQJq+Qst3LpYdhXkAY6Pxay381PmoxD5Ji/ZV86Q=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "f6a8720aa9bb03d0c8a97a93e994557292f1efba1fa6648cd8a07830622ce748"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "b2b652c75ad0e2138ed3925e43c12bd9b79be8a42a577dde9dcb518933e5501b"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "3f690edd5e28c28ea3a52beb3ec009726f6e72f4a67096f2ce2b1a4fa3b01e3d"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "9aa6f9f33e58e04fb9d8f9cd5c51dd01c6092d7b5434f84341b2f74bc8de783e"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "343fa41d0c67b1b1bb4cd962b0f8d5f9cf175ef1b3bca4348cdbf91670a1d782"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "efc96a222a2fd0b13104e6fd87dd6bbda9a96abeb20a1a1cc203044ce0a38749"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "9633b71655ed0f4af556c148f9bf7753221b3c9b42a8d902391187789302adca"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "04ac1b2f03bceb238ad600ef70ca7a78672d741e8ce430749b8eedbb1dd0ac47"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "d76ec4a39d66da2a98e7c55dc6811350b4333a2eeae9c0bd4fc401203d92d9e8"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.32.7+k3s1";
k3sCommit = "ab99e9da82c7072e4d9efbfa9464e343846fae72";
k3sRepoSha256 = "0srs8nrmnqsxlyhbbd7i18vbk5c55c16xg278958wi3lbwang0b2";
k3sVendorHash = "sha256-vKTujaFATguUtIorfa7bY8lSQsx6RhFx0sdWencR2nc=";
k3sVersion = "1.32.8+k3s1";
k3sCommit = "fe896f7e7cf8be1cfffe7151c6860deb08e2a005";
k3sRepoSha256 = "1knj7jzxb70zvqjn7pbjz78cm06w0402id5frib94y0i4rsmqd6g";
k3sVendorHash = "sha256-MbXTUvdnoLFVGYKEGBYWNkuL2Es0Io4q2E5qaUptwRQ=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";

View File

@@ -1,26 +1,26 @@
{
"airgap-images-amd64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "64690dc963f6cbff8adb175a1bc41e6bf207734a9a214362544a36361a2d8350"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
"sha256": "13832518d409f950121a9c681b878f868120c73d42d3823f55cea49f61b69497"
},
"airgap-images-amd64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1a3738a77c4a3fef4a85c16d7f2eadcd337605f9279fcddbc3eb4f982fbd2238"
},
"airgap-images-arm-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "878d17722dd98e7d88de93a83606e0c9b0d7587c7e4a043559b5236a353fb224"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.gz",
"sha256": "94b084b7f9756e986855301658af957042e3ebb7c71848860f823b35844e98fa"
},
"airgap-images-arm-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "1be4d940daea065ad97bc254882b12fb30af2f13ed2b26a7cd16aeacec29f048"
},
"airgap-images-arm64-tar-gz": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "e4ab063deb50241e60218a3a30ce090a5817daa0f38dacd10651e27b2be28b9e"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
"sha256": "a89d7916b65ed066e761fe07831aa157b91b30bc1369ea9be3d1e5f0fe1dc74c"
},
"airgap-images-arm64-tar-zst": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "6d898c35a9dc96d427f4258605ce61daf7587f26ea2822b711896224b746b38f"
}
}

View File

@@ -1,8 +1,8 @@
{
k3sVersion = "1.33.3+k3s1";
k3sCommit = "236cbf257332b293f444abe6f24d699ff628173e";
k3sRepoSha256 = "163brwnz4af1rjv5pcghlzjnwr27b087y73bv6pri0fyqd3mwiim";
k3sVendorHash = "sha256-rU+rpExb9LVIROPj3MN924r7Hk8sK/5P8JSssOoIWTU=";
k3sVersion = "1.33.4+k3s1";
k3sCommit = "148243c49519922720fe1b340008dbce8fb02516";
k3sRepoSha256 = "1870l3mq5nsh8i82wvwsz7nqiv1xzyqypm66rfmp999s2qlssyaa";
k3sVendorHash = "sha256-JbnoV8huyOS7Q91QjqTKvPEtkYQxjR10o0d5z25Ycsg=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.1";

View File

@@ -127,8 +127,14 @@ let
];
# bundled into the k3s binary
traefikChart = fetchurl chartVersions.traefik;
traefik-crdChart = fetchurl chartVersions.traefik-crd;
traefik = {
chart = fetchurl chartVersions.traefik;
name = builtins.baseNameOf chartVersions.traefik.url;
};
traefik-crd = {
chart = fetchurl chartVersions.traefik-crd;
name = builtins.baseNameOf chartVersions.traefik-crd.url;
};
# a shortcut that provides the images archive for the host platform. Currently only supports
# aarch64 (arm64) and x86_64 (amd64), throws on other architectures.
@@ -267,6 +273,18 @@ let
"linux"
];
# Set flags for sqlite dbstat
CGO_CFLAGS = "-DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_USE_ALLOCA=1";
# Copy manifests and static charts pre build so they get embedded during build
preBuild = ''
cp -av manifests/* ./pkg/deploy/embed/
mkdir -p ./pkg/static/embed/charts/
cp -v ${traefik.chart} ./pkg/static/embed/charts/${traefik.name}
cp -v ${traefik-crd.chart} ./pkg/static/embed/charts/${traefik-crd.name}
'';
# create the multicall symlinks for k3s
postInstall = ''
mv $out/bin/server $out/bin/k3s
@@ -402,10 +420,6 @@ buildGoModule rec {
ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni
ln -vsf ${k3sContainerd}/bin/containerd-shim-runc-v2 ./bin
rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/
mkdir -p ./build/static/charts
cp ${traefikChart} ./build/static/charts
cp ${traefik-crdChart} ./build/static/charts
export ARCH=$GOARCH
export DRONE_TAG="v${k3sVersion}"

View File

@@ -12,16 +12,6 @@ let
extraArgs = builtins.removeAttrs args [ "callPackage" ];
in
{
k3s_1_30 = common (
(import ./1_30/versions.nix)
// {
updateScript = [
./update-script.sh
"30"
];
}
) extraArgs;
k3s_1_31 = common (
(import ./1_31/versions.nix)
// {

View File

@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2025-08-09";
version = "0-unstable-2025-09-03";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "d929c14e7a15f69085bce6bca84af05a0fb3ff45";
hash = "sha256-nM/6+IzeZpiUKBTWc2kZUxp9vuhMtzHc9A/xYaMkmVQ=";
rev = "4a4931273868421e772c82f34f0df82252200526";
hash = "sha256-Wr/NIWObhzBdkI7QsYNLO52dYU3BUNGVKHliEcNGU3Y=";
};
dontConfigure = true;

View File

@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "bootdev-cli";
version = "1.20.1";
version = "1.20.2";
src = fetchFromGitHub {
owner = "bootdotdev";
repo = "bootdev";
tag = "v${version}";
hash = "sha256-fjXMaK6Mz38FJNrR+lVDi0EMxMoCTnC1q0wDQS1Mab8=";
hash = "sha256-TjldTmLX6H0k5mvq0SXoEuoFVxcmg+hMIXpCIVk1m3g=";
};
vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-flamegraph";
version = "0.6.8";
version = "0.6.9";
src = fetchFromGitHub {
owner = "flamegraph-rs";
repo = "flamegraph";
rev = "v${version}";
sha256 = "sha256-JGUABNCZhDyTTrjFCRsT+wkuAeZn9mCHCI6XgGYEl7Y=";
sha256 = "sha256-yU3iWfEjtdwRKRp27moUhPuvoCE+0DiuQ67QFPfz01Y=";
};
cargoHash = "sha256-FjLjEoorbZC2WZ424w2aFLmd4dIfy5s13sR8BSRVNIo=";
cargoHash = "sha256-7hmYrhOyEiseyDNea86EFBLhi5cOp6b5LO0Z8F+Ggpw=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ];

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-insta";
version = "1.43.1";
version = "1.43.2";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "insta";
rev = version;
hash = "sha256-8yFbf0MF5zDuMqG1AsCOvQhJc8D8cBH1WqCGulcXVH0=";
hash = "sha256-+0FJr1IXTnIc947ytB00z30m81peY/CjnBHMYvcQZl0=";
};
cargoHash = "sha256-atPSV+dZgywgS+9M0LRtMqH4JP4UpYGjb2hyGAEwhkw=";
cargoHash = "sha256-BYYn+GGJoI0W4mbQcKlQe5IOObIQrV8hTzJeRU6cIZo=";
checkFlags = [
# Depends on `rustfmt` and does not matter for packaging.

View File

@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-machete";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "bnjbvr";
repo = "cargo-machete";
rev = "v${version}";
hash = "sha256-exET/zBm5sjnrEx++PRgoWaz7lr7AEF+GVOTOZRGbbU=";
hash = "sha256-4tzffZeHdhAq6/K1BGkThqT+CBa3rUw+kR7aLwnqZjc=";
};
cargoHash = "sha256-vv6QYIkQtrwlXMKPuZ1ZRJkhaN2qDI0x8vSK/bzDipE=";
cargoHash = "sha256-ahTvfxYYo3prPKDTalw2f2FPJLsPzGkE/2LCcyuniFY=";
# tests require internet access
doCheck = false;

View File

@@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-workspaces";
version = "0.4.0";
version = "0.4.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-kBjiRPEWHKhX6vTB48TjKYhlpaiieNzE1l0PjaLTL4k=";
hash = "sha256-5heOf74OUsnrG+vt9AdMXV7uRxqKYs0KRE7qm0irmC0=";
};
cargoHash = "sha256-vHLc738wFunyUDu6/B5foTE2/wExd2Yxcl638iqOWdw=";
cargoHash = "sha256-Is2ddCrg+dP0TSw3EUl057RA0L2VW4mPttg2eAtC0j4=";
nativeBuildInputs = [
pkg-config

View File

@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "cloudflared";
version = "2025.8.0";
version = "2025.8.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
tag = version;
hash = "sha256-kvhDdgnAkYvs+W0TE8Pu3nlEp2n7tHDphDwqCc4J0eE=";
hash = "sha256-7qPyzxsCgRs/Jzwdg4MrtqD7arS7o420BkmbtXTlJe4=";
};
vendorHash = null;

View File

@@ -0,0 +1,42 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "doxx";
version = "0-unstable-2025-08-18";
src = fetchFromGitHub {
owner = "bgreenwell";
repo = "doxx";
rev = "5c957470de1fa937cf96cd847286e2d3ee37cbee";
hash = "sha256-ZCvb8FnGdpzEDqYCIFjg+hiO3OZNnZ2+dSDVLx+crTU=";
};
cargoHash = "sha256-1i+IAQc55HYrqJm3Hx0frphSQp7jYGa6i0eOvHVMdCI=";
postInstall = ''
rm $out/bin/generate_test_docs
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Terminal document viewer for .docx files";
longDescription = ''
`doxx` is a lightning-fast, terminal-native document viewer for
Microsoft Word files. Built with Rust for performance and
reliability, it brings Word documents to your command line with
beautiful rendering, smart table support, and powerful export
capabilities.
'';
homepage = "https://github.com/bgreenwell/doxx";
changelog = "https://github.com/bgreenwell/doxx/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ yiyu ];
mainProgram = "doxx";
};
})

View File

@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/sonnyp/eloquent";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ thtrf ];
mainProgram = "eloquent";
mainProgram = "re.sonny.Eloquent";
platforms = lib.platforms.linux;
};
})

View File

@@ -32,6 +32,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-dLX5FC5A3+Dr3Dex+YEAnDgNNOQYd2JgGujXWpnSNUo=";
cargoBuildFlags = [
"--exclude xtask"
"--workspace"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd espflash \
--bash <($out/bin/espflash completions bash) \

View File

@@ -1,12 +1,10 @@
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index dfe902e6b9..6fe3382f27 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -70,62 +70,6 @@
</execution>
@@ -71,62 +71,6 @@
</executions>
</plugin>
- <plugin>
<plugin>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>2.5.1</version>
@@ -62,18 +60,17 @@ index dfe902e6b9..6fe3382f27 100644
- </execution>
- </executions>
- </plugin>
<plugin>
- <plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 168ecba1dc..748dbf47b7 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -60,57 +60,6 @@
<target>17</target>
@@ -61,57 +61,6 @@
</configuration>
</plugin>
- <plugin>
<plugin>
- <groupId>com.akathist.maven.plugins.launch4j</groupId>
- <artifactId>launch4j-maven-plugin</artifactId>
- <version>2.5.1</version>
@@ -124,6 +121,8 @@ index 168ecba1dc..748dbf47b7 100644
- <!--extra-->
- </executions>
- </plugin>
<plugin>
- <plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>

View File

@@ -123,9 +123,7 @@ maven.buildMavenPackage {
done
'';
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=forge-(.*)" ];
};
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Magic: the Gathering card game with rules enforcement";

View File

@@ -0,0 +1,136 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p curl cacert nix-update jq gnused git
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
get_latest_version() {
local repo="$1"
curl -sfS ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/$repo/releases/latest | jq -r .tag_name
}
download_and_extract_source() {
local repo="$1"
local version="$2"
local temp_dir=$(mktemp -d)
curl -sfSL "https://github.com/$repo/archive/$version.tar.gz" | tar -xz -C "$temp_dir"
echo $temp_dir
}
check_plugin_in_pom() {
local pom_file="$1"
local plugin_name="$2"
if [[ -f "$pom_file" ]]; then
grep -q "<artifactId>$plugin_name</artifactId>" "$pom_file" 2>/dev/null
else
return 1
fi
}
remove_plugin_from_pom() {
local pom_file="$1"
local plugin_name="$2"
if [[ ! -f "$pom_file" ]]; then
echo "Error: $pom_file does not exist" >&2
return 1
fi
awk -v plugin="$plugin_name" '
/<plugin>/ {
plugin_block = $0 "\n"
in_plugin = 1
skip = 0
next
}
in_plugin && /<\/plugin>/ {
plugin_block = plugin_block $0 "\n"
if (!skip) {
printf "%s", plugin_block
}
in_plugin = 0
plugin_block = ""
next
}
in_plugin {
plugin_block = plugin_block $0 "\n"
if (/<artifactId>/ && index($0, plugin) > 0) {
skip = 1
}
next
}
!in_plugin { print }
' "$pom_file" > "$pom_file.tmp" && mv "$pom_file.tmp" "$pom_file"
echo "Removed plugin blocks with artifactId '$plugin_name' from $pom_file"
}
update_patch() {
local source_dir="$1"
local plugin_name="$2"
local patch_file="$3"
if [[ ! -d "$source_dir" ]]; then
echo "Source directory $source_dir does not exist!"
exit 1
fi
local temp_dir=$(mktemp -d)
local plugin_found=false
local patch_content=""
echo "Checking for $plugin_name in pom.xml files..."
# Find all pom.xml files that contain the specified plugin
while IFS= read -r -d '' pom_file; do
if check_plugin_in_pom "$pom_file" "$plugin_name"; then
plugin_found=true
echo "Found $plugin_name in: $pom_file"
# Generate patch content for this file
local relative_path=$(echo "$pom_file" | sed "s|^$source_dir/||")
local temp_original="$temp_dir/original_$(basename "$pom_file")"
local temp_patched="$temp_dir/patched_$(basename "$pom_file")"
cp "$pom_file" "$temp_original"
cp "$pom_file" "$temp_patched"
remove_plugin_from_pom "$temp_patched" "$plugin_name"
# Generate diff for this file
if ! cmp -s "$temp_original" "$temp_patched"; then
local file_diff=$(diff -u "$temp_original" "$temp_patched" | sed "s|$temp_original|a/$relative_path|g; s|$temp_patched|b/$relative_path|g" | sed '1,2s/\t.*$//')
if [[ -n "$file_diff" ]]; then
patch_content+='diff --git a/'"$relative_path"' b/'"$relative_path"''$'\n'
patch_content+="$file_diff"$'\n'
fi
fi
fi
done < <(find "$source_dir" -name "pom.xml" -print0)
if [[ "$plugin_found" == "true" && -n "$patch_content" ]]; then
echo "Updating $patch_file..."
echo "$patch_content" > "$SCRIPT_DIR/$patch_file"
echo "Patch updated successfully!"
rm -rf "$temp_dir"
else
echo "No $plugin_name found on any pom.xml file. Patch not updated."
rm -rf "$temp_dir"
exit 1
fi
}
echo "Updating forge-mtg package..."
version=$(get_latest_version "Card-Forge/forge")
source_dir=$(download_and_extract_source "Card-Forge/forge" $version)/forge-$version
update_patch "$source_dir" "launch4j-maven-plugin" "no-launch4j.patch"
rm -rf "$(dirname "$source_dir")"
nix-update --version-regex=forge-'(.*)' forge-mtg

View File

@@ -24,8 +24,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "aug25a";
version = "20250801_a";
srcVersion = "sep25a";
version = "20250901_a";
pname = "gildas";
src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
];
hash = "sha256-SqUE/cu23+i7QuGw7LFnLfP1hViUW4moJKfshu/3yXI=";
hash = "sha256-W2l2n6W8L5Gr7taw9ZUvVVp9sZvjne56sjtUU91U0oE=";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,27 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "537.0.0";
googleCloudSdkPkgs = {
x86_64-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-537.0.0-linux-x86_64.tar.gz";
sha256 = "08221f1alz5ss5fvqdj30k7c98l15gkzidhgj2fhlw5xwi7dp3cn";
};
x86_64-darwin = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-537.0.0-darwin-x86_64.tar.gz";
sha256 = "0my8vbdyf4iy7qry8vzhb0wmzlbqz7h891rw3vzhjcrksaa4xahn";
};
aarch64-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-537.0.0-linux-arm.tar.gz";
sha256 = "16zj9xx3mgldz0a9l45pw2l0gwkb9vfdv7s93v81pmz2jx5hd0d6";
};
aarch64-darwin = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-537.0.0-darwin-arm.tar.gz";
sha256 = "0h5ldp6gw7mk7m9jljl1lvvz7sxkrssyy0w3zag5c1lbb7fb9r60";
};
i686-linux = {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-537.0.0-linux-x86.tar.gz";
sha256 = "0sgnnspjhsk4ydkq7x7gcnw19dbf66cq1rrwr0r1r97953k8rhvj";
};
};
}

View File

@@ -12,7 +12,7 @@
lib,
fetchurl,
makeWrapper,
python3,
python312,
openssl,
jq,
callPackage,
@@ -21,6 +21,7 @@
}:
let
python3 = python312;
# include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
# remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
pythonCustom = python3.override {

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hath-rust";
version = "1.11.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "james58899";
repo = "hath-rust";
tag = "v${finalAttrs.version}";
hash = "sha256-y2DpYKUA6XdtkynHhavh2SLl9jR+WFCOoo+Ep3IEq7w=";
hash = "sha256-4dbloi88oR84JnD1nepLTJNSgxgB337F3nxr7i4nZV8=";
};
cargoHash = "sha256-al5JAiRzXFKuUdIRgnwkKEN9rHqU82/StiIjPkQjumU=";
cargoHash = "sha256-P975lZ6LgL+dT52td8uA8QVnuJd6QKWkpBCfoLpLW9E=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";

View File

@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-09-03";
version = "0-unstable-2025-09-04";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "30fc1b532645a21e157b6e33e3f8b4c154f86382";
hash = "sha256-XbtRMewPGJwTNhBC4pnBu3w/xT1XejvB0HfohC2Kga8=";
rev = "b08f8737776f10920c330657bee8b95834b7a70f";
hash = "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=";
};
nativeBuildInputs = [

View File

@@ -6,12 +6,12 @@
let
pname = "labymod-launcher";
version = "2.1.10";
version = "2.1.12";
src = fetchurl {
name = "labymod-launcher";
url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
hash = "sha256-yRzk1bish/KBe15rnnbaft3358zSv7WaejdvXAdpEC4=";
hash = "sha256-n0ipNxtmVSG/Do5UcFpWhGH+4SO3ZljsUXPW4hYzkZU=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

View File

@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "melange";
version = "0.30.6";
version = "0.31.0";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "melange";
rev = "v${version}";
hash = "sha256-Ue16XeZGr2eVHkugC9Ytno95Pqz63/AM3bO2eDkeDik=";
hash = "sha256-tNMnS0fq7uqIbfQkjj84SA3L4EFGvnRjIOHRZBptK5M=";
# 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;
@@ -26,7 +26,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-N38prBssebHmsfeRkPN9A7CLiH631t63HFhZwnSaiko=";
vendorHash = "sha256-izOOa98/cKom0PIttwuzInCvAg4zP0SxbLblKKB5oBI=";
subPackages = [ "." ];

View File

@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "nix-search-tv";
version = "2.1.8";
version = "2.2.0";
src = fetchFromGitHub {
owner = "3timeslazy";
repo = "nix-search-tv";
tag = "v${finalAttrs.version}";
hash = "sha256-WcA8j+qY9A3aLcaD7PYPb7AJ4wtKgogIZWqhIK3VFgM=";
hash = "sha256-YbtM4qfZj0SxbVIFH32UVZhEj0A6oILUOXqkBVz7VCE=";
};
vendorHash = "sha256-hBkro++bjYGrhnq8rmSuKTgnkicagOHTkfRYluSBUX8=";
vendorHash = "sha256-ZuhU1+XzJeiGheYNR4lL7AI5vgWvgp6iuJjMcK8t6Mg=";
subPackages = [ "cmd/nix-search-tv" ];

View File

@@ -1,108 +0,0 @@
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 3b69b2fc2..8549b9396 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -11,7 +11,6 @@ from typing import Final
from urllib.parse import urlparse
from celery.schedules import crontab
-from concurrent_log_handler.queue import setup_logging_queues
from django.utils.translation import gettext_lazy as _
from dotenv import load_dotenv
@@ -803,8 +802,6 @@ USE_TZ = True
# Logging #
###############################################################################
-setup_logging_queues()
-
LOGGING_DIR.mkdir(parents=True, exist_ok=True)
LOGROTATE_MAX_SIZE = os.getenv("PAPERLESS_LOGROTATE_MAX_SIZE", 1024 * 1024)
diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py
index b62e37166..415a69163 100644
--- a/src/paperless_mail/mail.py
+++ b/src/paperless_mail/mail.py
@@ -29,7 +29,7 @@ from imap_tools import MailBoxUnencrypted
from imap_tools import MailMessage
from imap_tools import MailMessageFlags
from imap_tools import errors
-from imap_tools.mailbox import MailBoxTls
+from imap_tools.mailbox import MailBoxStartTls
from imap_tools.query import LogicOperator
from documents.data_models import ConsumableDocument
@@ -419,7 +419,7 @@ def get_mailbox(server, port, security) -> MailBox:
if security == MailAccount.ImapSecurity.NONE:
mailbox = MailBoxUnencrypted(server, port)
elif security == MailAccount.ImapSecurity.STARTTLS:
- mailbox = MailBoxTls(server, port, ssl_context=ssl_context)
+ mailbox = MailBoxStartTls(server, port, ssl_context=ssl_context)
elif security == MailAccount.ImapSecurity.SSL:
mailbox = MailBox(server, port, ssl_context=ssl_context)
else:
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 5a1a6c6859a..95689b5124d 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -2038,6 +2038,24 @@ def validate(self, attrs):
return attrs
+ @staticmethod
+ def normalize_workflow_trigger_sources(trigger):
+ """
+ Convert sources to strings to handle django-multiselectfield v1.0 changes
+ """
+ if trigger and "sources" in trigger:
+ trigger["sources"] = [
+ str(s.value if hasattr(s, "value") else s) for s in trigger["sources"]
+ ]
+
+ def create(self, validated_data):
+ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data)
+ return super().create(validated_data)
+
+ def update(self, instance, validated_data):
+ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(validated_data)
+ return super().update(instance, validated_data)
+
class WorkflowActionEmailSerializer(serializers.ModelSerializer):
id = serializers.IntegerField(allow_null=True, required=False)
@@ -2202,6 +2220,8 @@ def update_triggers_and_actions(self, instance: Workflow, triggers, actions):
if triggers is not None and triggers is not serializers.empty:
for trigger in triggers:
filter_has_tags = trigger.pop("filter_has_tags", None)
+ # Convert sources to strings to handle django-multiselectfield v1.0 changes
+ WorkflowTriggerSerializer.normalize_workflow_trigger_sources(trigger)
trigger_instance, _ = WorkflowTrigger.objects.update_or_create(
id=trigger.get("id"),
defaults=trigger,
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 68d20476593..7415467de79 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -123,7 +123,7 @@ def setUp(self) -> None:
self.trigger = WorkflowTrigger.objects.create(
type=WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
- sources=[1],
+ sources=[str(WorkflowTrigger.DocumentSourceChoices.CONSUME_FOLDER.value)],
filter_filename="*",
)
self.action = WorkflowAction.objects.create(assign_title="new title")
diff --git a/src/documents/tests/test_migration_workflows.py b/src/documents/tests/test_migration_workflows.py
index 9895188188a..60e429d68c2 100644
--- a/src/documents/tests/test_migration_workflows.py
+++ b/src/documents/tests/test_migration_workflows.py
@@ -104,7 +104,7 @@ def setUpBeforeMigration(self, apps):
trigger = WorkflowTrigger.objects.create(
type=0,
- sources=[DocumentSource.ConsumeFolder],
+ sources=[str(DocumentSource.ConsumeFolder)],
filter_path="*/path/*",
filter_filename="*file*",
)

View File

@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
fetchPypi,
fetchpatch,
node-gyp,
nodejs_20,
nixosTests,
@@ -29,13 +28,13 @@
xorg,
}:
let
version = "2.18.2";
version = "2.18.3";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
tag = "v${version}";
hash = "sha256-JaDeOiubu9VE8E/u2K9BS7GLNSTqXTcX926WhPMGd64=";
hash = "sha256-rr1QfTNutKO+DwEQmltxdtjuk07mT0unlYo3SMq6oEs=";
};
python = python3.override {
@@ -169,6 +168,7 @@ python.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [
"django-allauth"
"filelock"
"rapidfuzz"
"redis"
];

View File

@@ -11,13 +11,13 @@
buildGo125Module (finalAttrs: {
pname = "pocket-id";
version = "1.9.1";
version = "1.10.0";
src = fetchFromGitHub {
owner = "pocket-id";
repo = "pocket-id";
tag = "v${finalAttrs.version}";
hash = "sha256-3sUkEbC96/XUR1tvCmxu56hPh7Ag/sD6/pGrq9JhHC8=";
hash = "sha256-YAQT7ORRg27ORh57NTE8F89iNfw+3gd1xPM8f4zHKm4=";
};
sourceRoot = "${finalAttrs.src.name}/backend";
@@ -49,7 +49,7 @@ buildGo125Module (finalAttrs: {
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-q2oXyFVdaDfJ4NFDt26/VJVXzQLCuKXHtCx1mah6Js8=";
hash = "sha256-Gjj2iFQ15Tso0gXihFH96nW49GJleOU323shBE7VgJ4=";
};
env.BUILD_OUTPUT_PATH = "dist";

View File

@@ -0,0 +1,26 @@
From d9c0d413ec38ae11cdd61bdc6b4b76d1f05a7794 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 4 Sep 2025 10:24:39 +0200
Subject: [PATCH] decoder: fix autoref error in pointer to reference conversion
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
src/decoder/mod.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
index eca51b6..b034d38 100644
--- a/src/decoder/mod.rs
+++ b/src/decoder/mod.rs
@@ -35,7 +35,7 @@ fn scratch_buffer() -> &'static mut [u8] {
unsafe {
let ptr: *mut MaybeUninit<[u8; 4096]> = &raw mut SCRATCH_BUFFER;
let ptr: &mut MaybeUninit<[u8; 4096]> = &mut *ptr;
- &mut (*ptr.as_mut_ptr())[..]
+ &mut *ptr.as_mut_ptr()
}
}
--
2.50.1

View File

@@ -0,0 +1,27 @@
From 4d098e36df3a81799231618ce1d88ca8759a6616 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 4 Sep 2025 10:46:17 +0200
Subject: [PATCH proxmox] pbs-api-types: crypto: fix autoref error in ptr to
ref conversion
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
pbs-api-types/src/crypto.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pbs-api-types/src/crypto.rs b/pbs-api-types/src/crypto.rs
index cdc1ba64..7b274982 100644
--- a/pbs-api-types/src/crypto.rs
+++ b/pbs-api-types/src/crypto.rs
@@ -88,7 +88,7 @@ pub mod bytes_as_fingerprint {
let mut s = String::deserialize(deserializer)?;
s.retain(|c| c != ':');
let mut out = MaybeUninit::<[u8; 32]>::uninit();
- hex::decode_to_slice(s.as_bytes(), unsafe { &mut (*out.as_mut_ptr())[..] })
+ hex::decode_to_slice(s.as_bytes(), unsafe { &mut *out.as_mut_ptr() })
.map_err(serde::de::Error::custom)?;
Ok(unsafe { out.assume_init() })
}
--
2.50.1

View File

@@ -148,9 +148,9 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
"synstructure",
]
@@ -160,20 +160,20 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "async-trait"
version = "0.1.88"
version = "0.1.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -246,9 +246,9 @@ dependencies = [
[[package]]
name = "bitflags"
version = "2.9.1"
version = "2.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
[[package]]
name = "block-buffer"
@@ -279,10 +279,11 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "cc"
version = "1.2.32"
version = "1.2.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
dependencies = [
"find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -290,9 +291,9 @@ dependencies = [
[[package]]
name = "cfg-if"
version = "1.0.1"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
[[package]]
name = "cfg_aliases"
@@ -373,7 +374,7 @@ version = "0.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"unicode-xid 0.2.6",
]
@@ -471,9 +472,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -494,10 +495,10 @@ checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
dependencies = [
"fnv",
"ident_case",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"strsim",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -508,7 +509,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -544,9 +545,9 @@ dependencies = [
[[package]]
name = "deranged"
version = "0.4.0"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
dependencies = [
"powerfmt",
"serde",
@@ -570,9 +571,9 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -694,9 +695,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
dependencies = [
"heck",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -788,16 +789,22 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
[[package]]
name = "filetime"
version = "0.2.25"
version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
dependencies = [
"cfg-if",
"libc",
"libredox",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
name = "find-msvc-tools"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
[[package]]
name = "flate2"
version = "1.1.2"
@@ -837,9 +844,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
version = "1.2.1"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
dependencies = [
"percent-encoding",
]
@@ -898,9 +905,9 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -966,7 +973,7 @@ dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasi 0.14.2+wasi-0.2.4",
"wasi 0.14.3+wasi-0.2.4",
]
[[package]]
@@ -998,7 +1005,7 @@ dependencies = [
"futures-core",
"futures-sink",
"http",
"indexmap 2.10.0",
"indexmap 2.11.0",
"slab",
"tokio",
"tokio-util",
@@ -1210,13 +1217,14 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "hyper"
version = "1.6.0"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
dependencies = [
"atomic-waker",
"bytes",
"futures-channel",
"futures-util",
"futures-core",
"h2",
"http",
"http-body",
@@ -1224,6 +1232,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
"pin-utils",
"smallvec",
"tokio",
"want",
@@ -1368,9 +1377,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
version = "1.0.3"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
dependencies = [
"idna_adapter",
"smallvec",
@@ -1400,9 +1409,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.10.0"
version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
dependencies = [
"equivalent",
"hashbrown 0.15.5",
@@ -1422,9 +1431,9 @@ dependencies = [
[[package]]
name = "io-uring"
version = "0.7.9"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
dependencies = [
"bitflags",
"cfg-if",
@@ -1498,16 +1507,16 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "jobserver"
version = "0.1.33"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
"getrandom 0.3.3",
"libc",
@@ -1654,9 +1663,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.27"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "lru-cache"
@@ -1798,12 +1807,11 @@ dependencies = [
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
version = "0.50.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
dependencies = [
"overload",
"winapi",
"windows-sys 0.52.0",
]
[[package]]
@@ -1979,9 +1987,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -2011,12 +2019,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "overload"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "p256"
version = "0.13.2"
@@ -2111,7 +2113,7 @@ dependencies = [
[[package]]
name = "pbs-buildcfg"
version = "4.0.13"
version = "4.0.14"
[[package]]
name = "pbs-client"
@@ -2308,7 +2310,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
"thiserror 2.0.14",
"thiserror 2.0.16",
"udev",
]
@@ -2343,9 +2345,9 @@ dependencies = [
[[package]]
name = "percent-encoding"
version = "2.3.1"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "pest"
@@ -2354,7 +2356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
dependencies = [
"memchr",
"thiserror 2.0.14",
"thiserror 2.0.16",
"ucd-trie",
]
@@ -2376,9 +2378,9 @@ checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
dependencies = [
"pest",
"pest_meta",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -2447,9 +2449,9 @@ dependencies = [
[[package]]
name = "potential_utf"
version = "0.1.2"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
dependencies = [
"zerovec",
]
@@ -2489,9 +2491,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.97"
version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1"
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
dependencies = [
"unicode-ident",
]
@@ -2512,14 +2514,14 @@ name = "proxmox-api-macro"
version = "1.4.1"
dependencies = [
"anyhow",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "proxmox-apt"
version = "0.99.2"
version = "0.99.3"
dependencies = [
"anyhow",
"apt-pkg-native",
@@ -2587,7 +2589,7 @@ dependencies = [
[[package]]
name = "proxmox-backup"
version = "4.0.13"
version = "4.0.14"
dependencies = [
"anyhow",
"async-trait",
@@ -2664,7 +2666,7 @@ dependencies = [
"serde_json",
"syslog",
"termcolor",
"thiserror 2.0.14",
"thiserror 2.0.16",
"tokio",
"tokio-openssl",
"tokio-stream",
@@ -2955,7 +2957,7 @@ version = "0.1.1"
dependencies = [
"serde",
"serde_with",
"thiserror 2.0.14",
"thiserror 2.0.16",
]
[[package]]
@@ -3138,7 +3140,7 @@ dependencies = [
[[package]]
name = "proxmox-s3-client"
version = "1.1.1"
version = "1.2.0"
dependencies = [
"anyhow",
"bytes",
@@ -3240,9 +3242,9 @@ dependencies = [
name = "proxmox-sortable-macro"
version = "1.0.0"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -3402,7 +3404,7 @@ version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
]
[[package]]
@@ -3481,16 +3483,16 @@ version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "regex"
version = "1.11.1"
version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
dependencies = [
"aho-corasick",
"memchr",
@@ -3500,9 +3502,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
dependencies = [
"aho-corasick",
"memchr",
@@ -3511,9 +3513,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.5"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
[[package]]
name = "resolv-conf"
@@ -3800,16 +3802,16 @@ version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "serde_json"
version = "1.0.142"
version = "1.0.143"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
dependencies = [
"itoa",
"memchr",
@@ -3846,7 +3848,7 @@ dependencies = [
"chrono",
"hex",
"indexmap 1.9.3",
"indexmap 2.10.0",
"indexmap 2.11.0",
"schemars 0.9.0",
"schemars 1.0.4",
"serde",
@@ -3863,9 +3865,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
dependencies = [
"darling",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4017,11 +4019,11 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.104"
version = "2.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"unicode-ident",
]
@@ -4041,9 +4043,9 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4072,15 +4074,15 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.20.0"
version = "3.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
dependencies = [
"fastrand",
"getrandom 0.3.3",
"once_cell",
"rustix",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@@ -4114,11 +4116,11 @@ dependencies = [
[[package]]
name = "thiserror"
version = "2.0.14"
version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b0949c3a6c842cbde3f1686d6eea5a010516deb7085f79db747562d4102f41e"
checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
dependencies = [
"thiserror-impl 2.0.14",
"thiserror-impl 2.0.16",
]
[[package]]
@@ -4127,20 +4129,20 @@ version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
name = "thiserror-impl"
version = "2.0.14"
version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc5b44b4ab9c2fdd0e0512e6bece8388e214c0749f5862b114cc5b7a25daf227"
checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4154,12 +4156,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.41"
version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
dependencies = [
"deranged",
"itoa",
"libc",
"num-conv",
"num_threads",
@@ -4171,15 +4172,15 @@ dependencies = [
[[package]]
name = "time-core"
version = "0.1.4"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
version = "0.2.22"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
@@ -4197,9 +4198,9 @@ dependencies = [
[[package]]
name = "tinyvec"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
dependencies = [
"tinyvec_macros",
]
@@ -4236,9 +4237,9 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4310,9 +4311,9 @@ version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4349,9 +4350,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.3.19"
version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
dependencies = [
"nu-ansi-term",
"sharded-slab",
@@ -4435,9 +4436,9 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "ureq"
version = "3.0.12"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f0fde9bc91026e381155f8c67cb354bcd35260b2f4a29bcc84639f762760c39"
checksum = "00432f493971db5d8e47a65aeb3b02f8226b9b11f1450ff86bb772776ebadd70"
dependencies = [
"base64 0.22.1",
"der",
@@ -4449,14 +4450,14 @@ dependencies = [
"rustls-pki-types",
"ureq-proto",
"utf-8",
"webpki-root-certs 0.26.11",
"webpki-root-certs",
]
[[package]]
name = "ureq-proto"
version = "0.4.2"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59db78ad1923f2b1be62b6da81fe80b173605ca0d57f85da2e005382adf693f7"
checksum = "bbe120bb823a0061680e66e9075942fcdba06d46551548c2c259766b9558bc9a"
dependencies = [
"base64 0.22.1",
"http",
@@ -4466,9 +4467,9 @@ dependencies = [
[[package]]
name = "url"
version = "2.5.4"
version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
dependencies = [
"form_urlencoded",
"idna",
@@ -4496,9 +4497,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.18.0"
version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
dependencies = [
"getrandom 0.3.3",
"js-sys",
@@ -4551,11 +4552,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasi"
version = "0.14.2+wasi-0.2.4"
version = "0.14.3+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
dependencies = [
"wit-bindgen-rt",
"wit-bindgen",
]
[[package]]
@@ -4578,9 +4579,9 @@ checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
dependencies = [
"bumpalo",
"log",
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
"wasm-bindgen-shared",
]
@@ -4600,9 +4601,9 @@ version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4684,15 +4685,6 @@ dependencies = [
"url",
]
[[package]]
name = "webpki-root-certs"
version = "0.26.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
dependencies = [
"webpki-root-certs 1.0.2",
]
[[package]]
name = "webpki-root-certs"
version = "1.0.2"
@@ -4726,11 +4718,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@@ -4758,9 +4750,9 @@ version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -4769,9 +4761,9 @@ version = "0.59.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -5031,13 +5023,10 @@ dependencies = [
]
[[package]]
name = "wit-bindgen-rt"
version = "0.39.0"
name = "wit-bindgen"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags",
]
checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
[[package]]
name = "writeable"
@@ -5102,9 +5091,9 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
"synstructure",
]
@@ -5123,9 +5112,9 @@ version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]
@@ -5143,9 +5132,9 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
"synstructure",
]
@@ -5183,9 +5172,9 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
dependencies = [
"proc-macro2 1.0.97",
"proc-macro2 1.0.101",
"quote 1.0.40",
"syn 2.0.104",
"syn 2.0.106",
]
[[package]]

View File

@@ -14,20 +14,20 @@
let
pname = "proxmox-backup-client";
version = "4.0.13";
version = "4.0.14";
proxmox-backup_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox-backup.git";
rev = "de92e3f6a26bfbcc9f8b860e983a85a434a8e3c6";
rev = "8b1b5f8e4d8216a0c45146b426dbfaff01ac0068";
name = "proxmox-backup";
hash = "sha256-09woNnl55zGIeHkX/UdBRg0mlKjD2HraPCjferNe81I=";
hash = "sha256-aLiGJcCsHI4QFfMwgmQsXWabRyQ829itNsIDcaVW4FA=";
};
proxmox_src = fetchgit {
url = "git://git.proxmox.com/git/proxmox.git";
rev = "84a58afe23a35454a1abbeb6c436ee49d2888d18";
rev = "56c4deb6309c41ff5afa5765b112be967c653857";
name = "proxmox";
hash = "sha256-p4o72RFuDBpgThJ39ZkIXriUQJZtYdrj9Biyl+XQ2hc=";
hash = "sha256-mkGvfWWis1W8xBLb8Da/uIauPEMKPosPdZ+UcgMrvkk=";
};
proxmox-fuse_src = fetchgit {
@@ -81,7 +81,10 @@ rustPlatform.buildRustPackage {
cp ${./Cargo.lock} Cargo.lock
rm .cargo/config.toml
# avoid some unnecessary dependendcies, stemming from greedy linkage by rustc
(cd ../pxar && chmod -R u+w . && patch -p1 <${./0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch})
(cd ../proxmox && chmod -R u+w . && patch -p1 <${./0004-pbs-api-types-crypto-fix-autoref-error-in-ptr-to-ref.patch})
# avoid some unnecessary dependencies, stemming from greedy linkage by rustc
# see also upstream Makefile for similar workaround
mkdir -p .dep-stubs
echo '!<arch>' >.dep-stubs/libsystemd.a

View File

@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.9.3.11.15";
version = "0.9.3.11.16";
pyproject = true;
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
tag = version;
hash = "sha256-xOEn01QrVlgXhFdO3YbR5+k7vkez//Y+YSKTI8C4uqA=";
hash = "sha256-PogdBixxr50M5J4hp158KAhs6+2E3ILCC44MAh222QY=";
};
nativeBuildInputs = [

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "rabbitmqadmin-ng";
version = "2.8.1";
version = "2.9.0";
src = fetchFromGitHub {
owner = "rabbitmq";
repo = "rabbitmqadmin-ng";
tag = "v${version}";
hash = "sha256-WI6v2XYb4/DwP7i7UIf8TtQJ3GFHgYTuxUhGWagJMsA=";
hash = "sha256-NiTLanB/Q5NtI1UUeaJ+IGJpJhfUhStsuJs6azSKnxE=";
};
cargoHash = "sha256-Q6cc5mzKMH3tZ0Qc0wqWIOy6tRSDmZLYSr5nzm7TloY=";
cargoHash = "sha256-IYwtap2zvGXb4pPXQGbE87hbFzxBVQ6i7cd3WWa0wX0=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];

View File

@@ -0,0 +1,135 @@
{
fetchFromGitHub,
cargo-tauri,
fetchFromRadicle,
git,
glib,
gtk3,
fetchNpmDeps,
npmHooks,
lib,
libsoup_3,
nodejs,
openssh,
openssl,
pkg-config,
playwright-driver,
radicle-node,
rustPlatform,
webkitgtk_4_1,
wrapGAppsHook4,
rustfmt,
clippy,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "radicle-desktop";
version = "0.8.0";
src = fetchFromRadicle {
seed = "seed.radicle.xyz";
repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
rev = "aeb405aaf53b56a426ab8d68c7f89b8953683224";
hash = "sha256-Z/6GdXf3ag/89H8UMD2GNU4CXA8TWyX8dl8uh0CTem8=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
rm -rf $out/.git
'';
};
postPatch = ''
patchShebangs scripts/copy-katex-assets scripts/check-js scripts/check-rs
mkdir -p public/twemoji
cp -t public/twemoji -r -- ${finalAttrs.twemojiAssets}/assets/svg/*
: >scripts/install-twemoji-assets
substituteInPlace scripts/check-rs \
--replace-fail "-Dwarnings" ""
'';
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
hash = "sha256-lcSNGmIv6u7DT47lOC69BRbVSK5IPiwjtdAS8aVxwqM=";
};
cargoHash = "sha256-z5fnwc7EjSvkyu4zTUyAvVfs6quwH2p9VFDK/TdzZJE=";
twemojiAssets = fetchFromGitHub {
owner = "twitter";
repo = "twemoji";
tag = "v14.0.2";
hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI=";
};
env = {
HW_RELEASE = "nixpkgs";
PLAYWRIGHT_BROWSERS_PATH = playwright-driver.browsers;
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = true;
PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
};
nativeBuildInputs = [
cargo-tauri.hook
npmHooks.npmConfigHook
nodejs
pkg-config
wrapGAppsHook4
];
buildInputs = [
glib
gtk3
libsoup_3
openssl
webkitgtk_4_1
];
preBuild = ''
export GIT_HEAD=$(<$src/.git_head)
'';
nativeCheckInputs = [
git
openssh
radicle-node
rustfmt
clippy
];
checkPhase = ''
runHook preCheck
export RAD_HOME="$PWD/_rad-home"
export RAD_PASSPHRASE=""
rad auth --alias test
bins="tests/tmp/bin/heartwood/$HW_RELEASE"
mkdir -p "$bins"
cp -t "$bins" -- ${radicle-node}/bin/*
echo -n "$HW_RELEASE" >tests/support/heartwood-release
npm run build:http
npm run test:unit
scripts/check-js
scripts/check-rs
runHook postCheck
'';
passthru.env = finalAttrs.env;
meta = {
description = "Radicle desktop app";
homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury";
changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
matthiasbeyer
defelo
faukah
];
mainProgram = "radicle-desktop";
};
})

View File

@@ -7,7 +7,7 @@
rainfrog,
}:
let
version = "0.3.5";
version = "0.3.7";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl";
repo = "rainfrog";
tag = "v${version}";
hash = "sha256-XLub56L26HHRW1UoNOT/wY1j85dJyaFDmmESGgzUank=";
hash = "sha256-6E59Sqe3igXcbd/E11+gOuaJufVV7Ayb0rIX3MCVvPY=";
};
cargoHash = "sha256-ZDO6wDp3t+/uoQdQR9AROjyVOLZ6Jc/gvXjHQCWDtog=";
cargoHash = "sha256-UTzXm/fToi1HPfX9H+G6o39kc+n9pCbqzfQjvV7IMv4=";
passthru = {
tests.version = testers.testVersion {

View File

@@ -18,16 +18,16 @@ in
buildGoModule rec {
pname = "regclient";
version = "0.9.0";
version = "0.9.1";
tag = "v${version}";
src = fetchFromGitHub {
owner = "regclient";
repo = "regclient";
rev = tag;
sha256 = "sha256-FVXTEP1CNlKmuorNxRE2SeiA90u2rz8sXELBtfRm9z0=";
sha256 = "sha256-OPBnks4Y3bumjChLGjJBeow9+HXs1pTIOK4XuQKCd70=";
};
vendorHash = "sha256-MP/drjUbST5s3NKQ6omVOLSvl4rdPSfVaM0zlF/9Cq0=";
vendorHash = "sha256-1jJ0iJSGYy1blbbA+WUqJE6wqEWvvdLu/g89BgMMJfI=";
outputs = [ "out" ] ++ bins;

File diff suppressed because it is too large Load Diff

View File

@@ -36,63 +36,22 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rustdesk";
version = "1.3.8";
version = "1.4.1";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-m1bFljZL8vNaugepVs8u1EWNpDLtxgSSZqKGQmgrmsA=";
hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4=";
"arboard-3.4.0" = "sha256-BJI3+Wz2xwnOfIz5O2NlPKKWfF8t/QrS8kxJK1RqbLw=";
"cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM=";
"cidre-0.4.0" = "sha256-FSpMC/kpTH10ncqRcJ+XJJ1yjgAc2U+mxLH9NTfLM3o=";
"clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA=";
"confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
"core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
"cpal-0.15.3" = "sha256-2Oo4igwjx9oZjikYEBfiVCD1Wl+D0LXgvVIHvYLQM+o=";
"default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU=";
"evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
"hwcodec-0.7.1" = "sha256-WxAa0DD8eVk6QyuIHuPDyFHGz8yj7I0qpRrJAc0iFpk=";
"impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
"keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
"machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
"magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg=";
"pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
"pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
"parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
"rdev-0.5.0-2" = "sha256-+1XsGhGcAz2YWENi+Ho614dhzjrwcY/gggq1YQ36fak=";
"reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
"rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
"sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E=";
"sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4=";
"tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk=";
"tfc-0.7.0" = "sha256-wJs+OhDZVO9iU+J7rLWIlV1VULtKyzizeXMbBCjRY90=";
"tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
"tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg=";
"wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q=";
"webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE=";
"x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc=";
"x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE=";
};
};
cargoHash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
patches = [
./make-build-reproducible.patch
];
postPatch = ''
# Overwrite cargo.lock because the one in the upstream repo has duplicates entries.
# It should probably be removed in the next rustdesk update (if they fix their cargoLock)
cp ${./Cargo.lock} Cargo.lock
'';
desktopItems = [
(makeDesktopItem {
name = "rustdesk";

View File

@@ -27,5 +27,6 @@ buildGoModule {
maintainers = [ lib.maintainers.samw ];
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
mainProgram = "sendgmail";
};
}

View File

@@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.15.1";
version = "2025.16";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-PBsBLzQ1+7+4Uw18OOhxkMZC5+YiUJlfHfIp7wUM5Rk=";
hash = "sha256-ovGrwngcnKN8FJ1PummXHxnGtPatV2Unb6t2Q1f144I=";
fetchSubmodules = true;
};

View File

@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "swappy";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "jtheoof";
repo = "swappy";
rev = "v${version}";
hash = "sha256-2BNnXtvliebTJAvoicsIEcGxJYnVp1wA8cv+dXr2vJY=";
hash = "sha256-rPe567ajk/umfZ2HHm+pRxpbMOTyUmqd+22kwDSFMTc=";
};
nativeBuildInputs = [

View File

@@ -5,6 +5,7 @@
jdk17,
jre17_minimal,
fetchFromGitHub,
fetchpatch,
makeWrapper,
mvnDepsHash ? null,
enableGui ? true,
@@ -49,6 +50,14 @@ maven.buildMavenPackage rec {
hash = "sha256-nuiE+MWJNA4PLprAC0vDBadk34TFsVEDBcCZct1XRxo=";
};
patches = [
(fetchpatch {
name = "CVE-2025-54988.patch";
url = "https://github.com/apache/tika/commit/bfee6d5569fe9197c4ea947a96e212825184ca33.patch";
hash = "sha256-LHM2SafZ85f53mWWSbA4ZQ/QSiDeiwNnzAbLGqGQqPM=";
})
];
buildOffline = true;
manualMvnArtifacts = [

View File

@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "timewarrior";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "GothenburgBitFactory";
repo = "timewarrior";
tag = "v${version}";
hash = "sha256-s7R92AR7pCcXkgI0BKnRship4TkWKx7km1W0ZyAEmnc=";
hash = "sha256-wwuyXcLCrNvpDIQvoBt/OQlwoTMhPzGZ+WrZdTo6IPo=";
fetchSubmodules = true;
};

View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.90.5";
version = "3.90.6";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
hash = "sha256-F45ORd/r7LlBsfA/QMtsHMOZKYhJULqZ4edwUoNt6Co=";
hash = "sha256-4WhnAuvuuLSn9TZTlaFWCWx4XwueRlErho8DD/YLJU4=";
};
vendorHash = "sha256-Kgobfg0TA2ocZhT/LfuGpMRTdFc9hOJM6uRf99cYkKA=";
vendorHash = "sha256-Et6otb8L4jEGrRW3VKxjgnrLDrq+kmors3oWVJf5WN0=";
nativeBuildInputs = [ makeWrapper ];

View File

@@ -7,14 +7,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "tuir";
version = "1.31.0";
version = "1.31.1";
pyproject = true;
src = fetchFromGitLab {
owner = "Chocimier";
repo = "tuir";
rev = "v${version}";
hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk=";
hash = "sha256-lUK6gXwvVjiYrJXMSFlzp07Yt+nSkU933J4vBJWOLlg=";
};
build-system = with python3Packages; [ setuptools ];

View File

@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.125.0";
version = "1.125.1";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-Xhurksf2BMw+v+4PsKm9o+XO2KfYX9wZTlq/kLLxVYc=";
hash = "sha256-pRYazo13K5mjdwQD3VJcX9Js4xEG9dgz7MbM8HvxWV0=";
};
vendorHash = null;

View File

@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.4.3.2";
version = "1.4.3.3";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-Ahp8Wcil0IWSMXXA0Hlm/4KtBCo4HFSQtYAjIlFGtgA=";
hash = "sha256-bhbk2ayY4syyUXJcYesRlVFArAVhivTjELvM8uuNzEQ=";
};
prePatch = ''

View File

@@ -1,14 +1,14 @@
{
"darwin": {
"hash": "sha256-RCe7St5HGDJS5+O5gmetu55/6F59pu4rs9JnYP7CUpQ=",
"version": "0.2025.08.27.08.11.stable_04"
"hash": "sha256-P3BKkOaT1k6OUJV65nF5UAVWFcDiAUfdaLpT9zuU8AM=",
"version": "0.2025.09.03.08.11.stable_03"
},
"linux_x86_64": {
"hash": "sha256-HyjretExpf4mfhTFRP5iCbXtubHxnzjXOvnZkHPvRzY=",
"version": "0.2025.08.27.08.11.stable_04"
"hash": "sha256-V1eDS7SQf4oJLiW9OroT9QKPryQWutXhILAlb7124ks=",
"version": "0.2025.09.03.08.11.stable_03"
},
"linux_aarch64": {
"hash": "sha256-XujRlhETOrFv+EmwGFrtZnyfD68vuNRVb7qovmJEOxk=",
"version": "0.2025.08.27.08.11.stable_04"
"hash": "sha256-pMYrBdHSgS4wZ9EX4Hj5NFiIz+V7CAWA4x33g5aZfLY=",
"version": "0.2025.09.03.08.11.stable_03"
}
}

View File

@@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.12.3",
"version": "1.12.4",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-darwin-arm64-1.12.3.zip",
"sha256": "cf604c6414f7f4d964a90aa4d6661592314e030fa31b28a2ac15b10bf3bbd529"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-arm64-1.12.4.zip",
"sha256": "b45050d9a38ca88b4768985f7007d2c222931d5e113c35bd2eeab9611873b6c8"
},
"x86_64-darwin": {
"version": "1.12.3",
"version": "1.12.4",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-darwin-x64-1.12.3.zip",
"sha256": "146adff77f43eac46c548c4204f2026c0820e8f7129ec426db8029d61ee664ec"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-darwin-x64-1.12.4.zip",
"sha256": "007207ae3fc620da956874c6d7162cd1d0728a0501b4227197f9d1a659b2e2b4"
},
"x86_64-linux": {
"version": "1.12.3",
"version": "1.12.4",
"vscodeVersion": "1.99.3",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/bfcd46e04becbf1670511e8c1e9cb0f1c1d62983/Windsurf-linux-x64-1.12.3.tar.gz",
"sha256": "c9f0ea20d016b817f3d4ac2f66b9310f70f8d2d5c2314f56125ae9dc1c29d74d"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a21cda2c21704d89e6cf5b2804b460783ce44fad/Windsurf-linux-x64-1.12.4.tar.gz",
"sha256": "bda6a3bd74524c3e70a7e1a53b63fda7f7ed1840707e4a1b0a7ead5f3b2c48a2"
}
}

View File

@@ -19,22 +19,27 @@
tcl,
ncurses,
openssl,
python3,
readline,
}:
let
majorVersion = "4";
minorVersion = "3";
versionSuffix = "ga8";
minorVersion = "4";
versionSuffix = "ga6";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "x3270";
version = "${majorVersion}.${minorVersion}${versionSuffix}";
src = fetchurl {
url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz";
sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk=";
url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${finalAttrs.version}-src.tgz";
hash = "sha256-hDju5ZeVzTv78ZYwUzabmqMK9rheTZJ7clTSTpkkM7E=";
};
postPatch = ''
patchShebangs .
'';
buildFlags = lib.optional stdenv.hostPlatform.isLinux "unix";
configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -44,13 +49,22 @@ stdenv.mkDerivation rec {
"--enable-tcl3270"
];
preBuild = ''
if [ -n "$SOURCE_DATE_EPOCH" ]; then
export SOURCE_DATE_EPOCH="$(date -u -d "@$SOURCE_DATE_EPOCH" '+%a %b %d %H:%M:%S UTC %Y')"
fi
'';
postBuild = ''
make install.man
'';
pathsToLink = [ "/share/man" ];
nativeBuildInputs = [ m4 ];
nativeBuildInputs = [
m4
python3
];
buildInputs = [
expat
libX11
@@ -74,10 +88,10 @@ stdenv.mkDerivation rec {
libiconv
];
meta = with lib; {
meta = {
description = "IBM 3270 terminal emulator for the X Window System";
homepage = "https://x3270.bgp.nu/index.html";
license = licenses.bsd3;
maintainers = [ maintainers.anna328p ];
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.anna328p ];
};
}
})

View File

@@ -99,7 +99,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.202.6";
version = "0.202.7";
outputs = [
"out"
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-S220e+mK0IHKVrSRAcbYtlIpK0T25+2gpIzMmyjaM2Y=";
hash = "sha256-0Ro/8d0EAb44SrPp34tpLLA8LDPiddzZiwZzQhJrjQ8=";
};
patches = [
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
'';
cargoHash = "sha256-P3eOp81LHXZr4O29kuuChd22ucFfkbneQvzKxpDhrV0=";
cargoHash = "sha256-ehFq0e5G+3242nMHFIDFXVhZCyjwxfMckjhKQ7Iwbu0=";
nativeBuildInputs = [
cmake

View File

@@ -128,6 +128,8 @@ stdenv.mkDerivation (
"-Dlibpth=\"\""
"-Dglibpth=\"\""
"-Ddefault_inc_excludes_dot"
# https://github.com/arsv/perl-cross/issues/158
"-Dd_gnulibc=define"
]
else
(

View File

@@ -2,7 +2,6 @@
lib,
buildPerlPackage,
fetchFromGitHub,
fetchpatch,
GD,
IPCShareLite,
JSON,
@@ -15,22 +14,16 @@
buildPerlPackage rec {
pname = "Tirex";
version = "0.7.1";
version = "0.8.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "tirex";
tag = "v${version}";
hash = "sha256-p2P19tifA/AvJatTzboyhtt7W1SwKJQzqpU4oDalfhU=";
hash = "sha256-tFDyN3slj9ipa9JPB6f+mnzMIW926vOge4ZSbmxjtiE=";
};
patches = [
# Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`)
# https://github.com/openstreetmap/tirex/pull/54
(fetchpatch {
url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch";
hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0=";
})
# Support Mapnik >= v4.0.0 (no more mapnik-config)
./use-pkg-config.patch
];

View File

@@ -6,8 +6,8 @@
-CXXFLAGS = `mapnik-config --cflags` $(CFLAGS)
+CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast
-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs`
-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs` -lboost_filesystem
+LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem
backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o
$(CXX) -o $@ $^ $(LDFLAGS)
$(CXX) -o $@ $^ $(LDFLAGS)

View File

@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aioamazondevices";
version = "5.0.0";
version = "6.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "chemelli74";
repo = "aioamazondevices";
tag = "v${version}";
hash = "sha256-MB7CRYHT4V7JvNFkdX9x/fMRkJrHwF4XnQ2eH0kD8Ng=";
hash = "sha256-PHgYyQInXT7gwgBnKm1FfEUiHygMCcPcFJk0zU5tWOc=";
};
build-system = [ poetry-core ];

View File

@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "aioazuredevops";
version = "2.2.1";
version = "2.2.2";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -31,14 +31,9 @@ buildPythonPackage rec {
owner = "timmo001";
repo = "aioazuredevops";
tag = version;
hash = "sha256-RZBiFPzYtEoc51T3irVHL9xVlZgACyM2lu1TkMoatqU=";
hash = "sha256-0KQHL9DmNeRvEs51XPcncxNzXb+SqYM5xPDvOdKSQMI=";
};
postPatch = ''
substituteInPlace requirements_setup.txt \
--replace-fail "==" ">="
'';
build-system = [
incremental
setuptools
@@ -65,6 +60,11 @@ buildPythonPackage rec {
"test_get_build"
];
disabledTestPaths = [
# https://github.com/timmo001/aioazuredevops/commit/d6278d92937dd47de272ac6371b2d007067763c3
"tests/test__version.py"
];
pytestFlags = [ "--snapshot-update" ];
pythonImportsCheck = [ "aioazuredevops" ];

View File

@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aioecowitt";
version = "2025.3.1";
version = "2025.9.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioecowitt";
tag = version;
hash = "sha256-BAiRonfu3tFf5ZERbWO+MuEsefrOIaGxUExYx5fXZIM=";
hash = "sha256-i8F7vEtuorBHY7/bm+RqnUmb9CR4iopjlyPJPQ5GoMg=";
};
build-system = [ setuptools ];

View File

@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "37.2.5";
version = "39.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = "aioesphomeapi";
tag = "v${version}";
hash = "sha256-+l/tEdraTkNt70sjcGpS/e1uEyudEsJdlqgoHPhMNg0=";
hash = "sha256-vBRKngr8Yn9TBAS0bXBetwXJbLPDabOL6nW0oH5Q/U0=";
};
build-system = [

View File

@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohasupervisor";
version = "0.3.1";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -26,13 +26,13 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-supervisor-client";
tag = version;
hash = "sha256-CrcLyG8fpThYHFHH2w+UAlGxuqwpUCWsYUx2gaW9RLw=";
hash = "sha256-LR3ZZD7TLpvCGVSx27tSxa7H2A06JBPBCH2yHGvqV84=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'version = "0.0.0"' 'version = "${version}"' \
--replace-fail 'setuptools>=68.0,<79.1' setuptools
--replace-fail "setuptools>=68.0,<80.10" "setuptools"
'';
build-system = [ setuptools ];

View File

@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "aiontfy";
version = "0.5.3";
version = "0.5.4";
pyproject = true;
src = fetchFromGitHub {
owner = "tr4nt0r";
repo = "aiontfy";
tag = "v${version}";
hash = "sha256-xDcx0darzaTRNdtsNTK7rdO5W22Tpt13ZPDOSmO8M8M=";
hash = "sha256-kJ6hf7CaE0uTZ7w3ggErDbXm8tYzSxstQ0qjKHlVytI=";
};
build-system = [

View File

@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "airos";
version = "0.2.11";
version = "0.4.4";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "CoMPaTech";
repo = "python-airos";
tag = "v${version}";
hash = "sha256-rPgrnLMcqUDd1+WL6uwb5Umu3a844B301l+O/GEyCGA=";
hash = "sha256-ngKe1hAVC1CRDSX0iTl/3wvpb61c0OFbU468CtjEbSU=";
};
build-system = [ setuptools ];

View File

@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.45.3";
version = "0.45.4";
pyproject = true;
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
tag = version;
hash = "sha256-7CU3o7SrBDxgf4Bd7SBkZlfwwdeo1Rr+UyapX3ORyfU=";
hash = "sha256-bDVNzOlzFqJvwc7d/CMuC/RSEMsQodN61UpHuKgyH0Y=";
};
postPatch = ''

View File

@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "bleak-esphome";
version = "3.1.0";
version = "3.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bluetooth-devices";
repo = "bleak-esphome";
tag = "v${version}";
hash = "sha256-L2/DtT1vEkP67oktLNix+/+eoVbJoMfUvW6232gSMCM=";
hash = "sha256-3gCh7HSsllTgLeb8jWPUB2+KXu+cuMZ3yeIJVNPBMC4=";
};
postPatch = ''

View File

@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
version = "4.3.0";
version = "4.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "bleak-retry-connector";
tag = "v${version}";
hash = "sha256-NqJBxWuFr+vMOt3Yjwaey7SPII/KNc22NKAb2DLXtKM=";
hash = "sha256-/IJBAeb/PdJt0IbLm3RnaHn4o8o1DXN8jGiQtzp7wLg=";
};
build-system = [ poetry-core ];

View File

@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "bluetooth-adapters";
version = "2.0.0";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "bluetooth-adapters";
tag = "v${version}";
hash = "sha256-0WZ6M/e5HLG1jS635Ir9eSGUW/2+YdU0tfszt+gM/qo=";
hash = "sha256-euAyVSBmlMsPMUnxn8L7p0n939TQe4id+JTtUk4pHIY=";
};
outputs = [
@@ -40,8 +40,11 @@ buildPythonPackage rec {
];
build-system = [
myst-parser
poetry-core
];
nativeBuildInputs = [
myst-parser
sphinx-rtd-theme
sphinxHook
];
@@ -65,11 +68,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "bluetooth_adapters" ];
meta = with lib; {
meta = {
description = "Tools to enumerate and find Bluetooth Adapters";
homepage = "https://github.com/Bluetooth-Devices/bluetooth-adapters";
changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/${src.tag}/CHANGELOG.md";
license = licenses.asl20;
teams = [ teams.home-assistant ];
license = lib.licenses.asl20;
teams = [ lib.teams.home-assistant ];
};
}

View File

@@ -20,21 +20,23 @@
numpy,
pytestCheckHook,
python-dateutil,
pydantic,
tomli-w,
polars,
pandas,
uuid6,
}:
buildPythonPackage rec {
pname = "deepdiff";
version = "8.5.0";
version = "8.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "seperman";
repo = "deepdiff";
tag = version;
hash = "sha256-JIxlWy2uVpI98BmpH2+EyOxfYBoO2G2S0D9krduVo08=";
hash = "sha256-1DB1OgIS/TSMd+Pqd2vvW+qwM/b5+Dy3qStlg+asidE=";
};
build-system = [
@@ -60,16 +62,15 @@ buildPythonPackage rec {
numpy
pytestCheckHook
python-dateutil
pydantic
tomli-w
polars
pandas
uuid6
]
++ lib.flatten (lib.attrValues optional-dependencies);
disabledTests = [
# not compatible with pydantic 2.x
"test_pydantic1"
"test_pydantic2"
# Require pytest-benchmark
"test_cache_deeply_nested_a1"
"test_lfu"

View File

@@ -5,23 +5,20 @@
setuptools,
httpx,
pyjwt,
pythonOlder,
websockets,
yarl,
}:
buildPythonPackage rec {
pname = "elmax-api";
version = "0.0.6.3";
version = "0.0.6.4rc0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "albertogeniola";
repo = "elmax-api";
tag = "v${version}";
hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg=";
hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ=";
};
build-system = [ setuptools ];

View File

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "eternalegypt";
version = "0.0.17";
version = "0.0.16";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "amelchio";
repo = "eternalegypt";
tag = "v${version}";
hash = "sha256-Qb8s8jU5yn7BIXVIV5cjwE0OnZOWEK8dzTmQDJM22rE=";
hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0=";
};
propagatedBuildInputs = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python API for Netgear LTE modems";
homepage = "https://github.com/amelchio/eternalegypt";
changelog = "https://github.com/amelchio/eternalegypt/releases/tag/${src.tag}";
changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View File

@@ -1,6 +1,7 @@
{
lib,
bleak,
bleak-retry-connector,
buildPythonPackage,
fetchFromGitHub,
pytest-mock,
@@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "fjaraskupan";
version = "2.3.2";
version = "2.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,12 +21,15 @@ buildPythonPackage rec {
owner = "elupus";
repo = "fjaraskupan";
tag = version;
hash = "sha256-IKi2kaypwHdK9w+FZlWrreUXBgBgg4y3D8bSJhKHSYo=";
hash = "sha256-xu5u3hvtD1gbN1f1UuxDQVIHF5pyCOWVwUq36vAgW/Y=";
};
build-system = [ setuptools ];
dependencies = [ bleak ];
dependencies = [
bleak
bleak-retry-connector
];
nativeCheckInputs = [
pytest-mock

View File

@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "gitignore-parser";
version = "0.1.12";
version = "0.1.13";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
owner = "mherrmann";
repo = "gitignore_parser";
tag = "v${version}";
hash = "sha256-s1t7WTrtxeeL4we+Y8I6XK8vKzmDVftmtXhRS/XeSAM=";
hash = "sha256-jd5C8whfdLuEC+ebDAAYso33o2H963P+8RWcm26koVM=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
nativeCheckInputs = [ unittestCheckHook ];
@@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Spec-compliant gitignore parser";
homepage = "https://github.com/mherrmann/gitignore_parser";
changelog = "https://github.com/mherrmann/gitignore_parser/releases/tag/v${version}";
changelog = "https://github.com/mherrmann/gitignore_parser/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View File

@@ -9,26 +9,27 @@
}:
buildPythonPackage rec {
pname = "gotenberg-client";
version = "0.10.0";
version = "0.11.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "stumpylog";
repo = "gotenberg-client";
tag = version;
hash = "sha256-eDYgKbNeNCIdENo6DVmcABRwP5JUMCJW7NtbPOA5aqg=";
hash = "sha256-a/GXVhZtxGgmx5mb8hozbXAI9ecrl0c6BIz3BNekA8Q=";
};
nativeBuildInputs = [ hatchling ];
build-system = [ hatchling ];
propagatedBuildInputs = [
dependencies = [
httpx
]
++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
++ httpx.optional-dependencies.http2;
# requires running gotenberg service
doCheck = false;
pythonImportsCheck = [ "gotenberg_client" ];
meta = with lib; {

View File

@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "habluetooth";
version = "4.0.2";
version = "5.3.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "habluetooth";
tag = "v${version}";
hash = "sha256-82eV76oY/exkHbhZt3OaifOoKxN2D6npstvfBDVgszw=";
hash = "sha256-9T6GvNHHxOpoPkN1Blyd/ErqYFei5UcaKQbd5gog6qM=";
};
postPatch = ''

View File

@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.111.2";
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -35,9 +35,14 @@ buildPythonPackage rec {
owner = "nabucasa";
repo = "hass-nabucasa";
tag = version;
hash = "sha256-64DdjyzeeYI9u8hYP7CwZvLhCcCzztti2DshvtYcxNQ=";
hash = "sha256-rQHXidzlxIXG+TIrbdM1oxnOwfi0MFZb7HIDIW6D4Jk=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "0.0.0" "${version}"
'';
build-system = [ setuptools ];
pythonRelaxDeps = [

View File

@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "homematicip";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "hahn-th";
repo = "homematicip-rest-api";
tag = version;
hash = "sha256-GmP3ZWn678ss3VtF26iI4t3CZegbajENg7gL19u3Mas=";
hash = "sha256-yH9Yis6NyKD+mSjaff0S9J6UtoVceML06ny50/6aG/0=";
};
build-system = [

View File

@@ -5,6 +5,7 @@
blurhash,
cryptography,
decorator,
grapheme,
http-ece,
python-dateutil,
python-magic,
@@ -19,14 +20,14 @@
buildPythonPackage rec {
pname = "mastodon-py";
version = "2.0.1";
version = "2.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
tag = "v${version}";
hash = "sha256-Sqvn7IIzkGnIjMGek1QS4pLXI+LoKykJsVnr/X1QH7U=";
hash = "sha256-aLoAuuUvesXu5D261MTcexixUxZST12fm1kKB/JChWY=";
};
build-system = [ setuptools ];
@@ -41,6 +42,7 @@ buildPythonPackage rec {
optional-dependencies = {
blurhash = [ blurhash ];
grapheme = [ grapheme ];
webpush = [
http-ece
cryptography
@@ -54,14 +56,14 @@ buildPythonPackage rec {
pytest-vcr
requests-mock
]
++ lib.flatten (builtins.attrValues optional-dependencies);
++ lib.flatten (lib.attrValues optional-dependencies);
disabledTests = [
"test_notifications_dismiss_pre_2_9_2"
"test_status_card_pre_2_9_2"
"test_stream_user_direct"
"test_stream_user_local"
];
# disabledTests = [
# "test_notifications_dismiss_pre_2_9_2"
# "test_status_card_pre_2_9_2"
# "test_stream_user_direct"
# "test_stream_user_local"
# ];
pythonImportsCheck = [ "mastodon" ];

View File

@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "nextdns";
version = "4.0.0";
version = "4.1.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = "nextdns";
tag = version;
hash = "sha256-2BT47Dg+1TLDUccdb0Q/r3QzpRURTwFlUORbQpmIJzc=";
hash = "sha256-VTOANFrGOI1XDU/5THWkj/o5AWIpXcPKmOF1IF0I22Y=";
};
build-system = [ setuptools ];

View File

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyais";
version = "2.13.1";
version = "2.13.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "M0r13n";
repo = "pyais";
tag = "v${version}";
hash = "sha256-T6ibxUt62oZ1obokdFIU9l0hmtCMnZzc/YOIK2QUcCE=";
hash = "sha256-CLsUVARpyxOshvrHY+NoVi0HSvn1R02jDnMqn0sRGgM=";
};
build-system = [ setuptools ];

View File

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "14.0.7";
version = "14.0.9";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -20,12 +20,12 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "pychromecast";
tag = version;
hash = "sha256-NB/KXKgmyLAhsL/CD463eNMO8brye5LKVCkkD3EloPU=";
hash = "sha256-SpoVgXJV/9SVAcZXfeqpB3jkt9UUWcY9NBDGeIFhh4w=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools>=65.6,<78.0" setuptools \
--replace-fail "setuptools>=65.6,<81.0" setuptools \
--replace-fail "wheel>=0.37.1,<0.46.0" wheel
'';

View File

@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyowm";
version = "3.3.0";
version = "3.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "csparpa";
repo = "pyowm";
tag = version;
hash = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME=";
hash = "sha256-D1Cl3uWoEIUqA0R+bjRL2YgsVKj5inuBAVLJYluADg0=";
};
pythonRelaxDeps = [ "geojson" ];

Some files were not shown because too many files have changed in this diff Show More