Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "allure";
|
||||
version = "2.36.0";
|
||||
version = "2.37.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-sUXVk6v0oJHoyql4i6XKM8D+9jXN/HYCv/mjyhndRxo=";
|
||||
hash = "sha256-pl0n9X8HnIsazyG7qvJw2wmpwhKa/i7ohlHOsHg9glw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "althttpd";
|
||||
version = "0-unstable-2025-08-22";
|
||||
version = "0-unstable-2026-01-27";
|
||||
|
||||
src = fetchfossil {
|
||||
url = "https://sqlite.org/althttpd/";
|
||||
rev = "e9bf26f78e1f5792";
|
||||
hash = "sha256-Q16tqhnPzYrFkrHTC8NBrdpsbrpjPUkdxLwmyYqUHZo=";
|
||||
rev = "7758535a137da507";
|
||||
hash = "sha256-9yszcoYpbM9/KDn7zpWgDINZF6azkQVxwlOw7BvRo+4=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "1.18.3",
|
||||
"version": "1.18.4",
|
||||
"vscodeVersion": "1.107.0",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.3-4739469533380608/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "4c7fe48c954e4d255c5d3ea4c74f168a4a7187fd2beedb223423cb57481c9638"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/linux-x64/Antigravity.tar.gz",
|
||||
"sha256": "f97d790d1fb74e8ccb9ddb6af301a2b60391aed22f633f1a2baf86862aa65826"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.3-4739469533380608/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "258778041c502e7ce74b39959e9b93d28f5c1d8154e553863f58a365e5a9fca5"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/linux-arm/Antigravity.tar.gz",
|
||||
"sha256": "eee54e88290cf4b0b8feb56283a04ab31ce4746465ca0bd1afd3e4505b2f95ea"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.3-4739469533380608/darwin-x64/Antigravity.zip",
|
||||
"sha256": "9e5b9bca3807df01684af506515f7c6f2b3635b2e5a778c170b7d1543dbedf19"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/darwin-x64/Antigravity.zip",
|
||||
"sha256": "fdff8b6fdfda9a28ac5a147f174337c3cf515b10cddc8466af5a32c6deaaca87"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.3-4739469533380608/darwin-arm/Antigravity.zip",
|
||||
"sha256": "cbd77fd2efe472eb36287feb3212ec7df4e81e49d8801e77fe0fa1c5ee5b30e8"
|
||||
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.18.4-5780041996042240/darwin-arm/Antigravity.zip",
|
||||
"sha256": "f1ccd9e3f051431b54b95b905afed8ec1b8b1a3f1bc841b3617b143553fd6f51"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "26.1.2.11-stable";
|
||||
rev = "53779390caa67a65a2368cdbb7533ed925608ba9";
|
||||
hash = "sha256-azzrQ37AhC0KvA7ZMLlSSWxEdwzSfrbaBFSUerOqVCY=";
|
||||
version = "26.1.3.52-stable";
|
||||
rev = "5549f2acae95c6d627654f50e212a85d059a55f9";
|
||||
hash = "sha256-7Ww7vQNjvR65Ycw2jnetyy6s8KkHOylzFey+K2xBLjM=";
|
||||
lts = false;
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cobalt";
|
||||
version = "0.20.3";
|
||||
version = "0.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cobalt-org";
|
||||
repo = "cobalt.rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ec6S6PQzDc8t8MuZLyVStxi7tQB6rMu+Fz8Tw1qpTGc=";
|
||||
hash = "sha256-XS8KZXHmeMPwCXMR68yIHYikV6Zwj46w2Mtz+d0JCTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xwpEdhV9YDfNIbjocz5N0E4BO8FW7Af2kW4QndqZhPo=";
|
||||
cargoHash = "sha256-vd+udalOsHMCWBI23v56N2yHRVlbKC0gjvFHJeCv0qw=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -21,8 +21,29 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
|
||||
doCheck = false;
|
||||
# required for TestHTTPHandlerReadWrite and other tests
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"TestExtract" # block cloning fails on ZFS
|
||||
"TestExtractCommand/extract_while_regenerating_the_corrupted_seed" # block cloning fails on ZFS
|
||||
"TestExtractCommand/extract_with_seed_directory" # block cloning fails on ZFS
|
||||
"TestExtractCommand/extract_with_single_seed" # block cloning fails on ZFS
|
||||
"TestExtractCommand/extract_with_single_seed,_explicit_data_directory_and_unexpected_seed_options" # block cloning fails on ZFS
|
||||
"TestExtractCommand/extract_with_single_seed_and_explicit_data_directory" # block cloning fails on ZFS
|
||||
"TestExtractWithNonStaticSeeds" # block cloning fails on ZFS
|
||||
"TestMountIndex" # FUSE does not work in sandbox
|
||||
"TestSeed/extract_repetitive_file" # block cloning fails on ZFS
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# sendfile is not permitted in Darwin sandbox
|
||||
"TestS3StoreGetChunk/fail"
|
||||
"TestS3StoreGetChunk/recover"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd desync \
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gatus";
|
||||
version = "5.34.0";
|
||||
version = "5.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TwiN";
|
||||
repo = "gatus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+Ulttz13SzPnB+EFsyK2H/bv2vXn+uA/zv6UY9HKrgY=";
|
||||
hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xN38oaMcErkq4FtWi/Kzp9fhC5dk8CeJYehlwtVgf0M=";
|
||||
vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-81CWJJr+vOF6WJbO/7sZuAkBfy7cNsUUTpxTUnaM0fg=";
|
||||
hash = "sha256-dXVpuxs2+v6voNn+gUZbYa6XxRDwKWnLd3mASLYHHl0=";
|
||||
};
|
||||
in
|
||||
flutter338.buildFlutterApplication {
|
||||
|
||||
@@ -1744,11 +1744,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8",
|
||||
"sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.8"
|
||||
"version": "0.7.9"
|
||||
},
|
||||
"tray_manager": {
|
||||
"dependency": "direct main",
|
||||
@@ -2134,6 +2134,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.9.0 <4.0.0",
|
||||
"flutter": ">=3.41.0"
|
||||
"flutter": ">=3.41.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "corral";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = "corral";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zbOlk92oyy17VyUalYnUZPxAO+8wjRMCqcwLx0lLL1g=";
|
||||
hash = "sha256-pJ6/+PYxMpJcj1e9v2Al8vIWFizJnLMIw7LlVU9ogS0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.10.1";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5o0czo6NmygF78vFkIWjK/Ab5yRaYNZm5vOck355NJE=";
|
||||
hash = "sha256-k6o8X98f7zMgB5gsw1cX8rfxE88LTgz5qgDTZ+rLeMA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RwncE9D6MRXLCJUNjoQFxQ40y+Q9/LQUrqnGfzQCduU=";
|
||||
npmDepsHash = "sha256-L5Ga/TZ1dhlZWx9cCk988dIax4w92B2L4uviUSsgn1c=";
|
||||
|
||||
# npm 11 incompatible with fetchNpmDeps
|
||||
# https://github.com/NixOS/nixpkgs/issues/474535
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "resterm";
|
||||
version = "0.22.0";
|
||||
version = "0.23.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unkn0wn-root";
|
||||
repo = "resterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-ePWzD1y6UuNcM0nz1TaonUC83whhCg7kpO01xnpki5g=";
|
||||
sha256 = "sha256-FS+pStcAuoslrso1kmriyKhr2I8MdvvUnH262hMKLEg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q459U/zHaqaOwTlNtKc2hhpLWA8gMwIfwrmxThE3Ic4=";
|
||||
vendorHash = "sha256-UnjH2d0w+ttIE2QTsYvpvNVYT6m9d0TGcrIhNE0SjTI=";
|
||||
|
||||
# modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols
|
||||
modPostBuild = ''
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ scala, fetchurl }:
|
||||
|
||||
scala.bare.overrideAttrs (oldAttrs: {
|
||||
version = "3.7.3";
|
||||
version = "3.8.1";
|
||||
pname = "scala-next";
|
||||
src = fetchurl {
|
||||
inherit (oldAttrs.src) url;
|
||||
hash = "sha256-KmIgDOX4TtioGvcDJ0+sGxq+fFqlKM/hZNBb0Q+7Z8A=";
|
||||
hash = "sha256-6RdU/L3zUQE7uiC7T1q8TptJCoMnKxk84CLXQ9Q0Ao8=";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
buildGo125Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
mockgen,
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "terragrunt";
|
||||
version = "0.97.0";
|
||||
version = "0.99.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LJGc85oCDEW/z9I4Mcr9Pyv9MLqqN4Zu/nJK1LTD9mk=";
|
||||
hash = "sha256-WbFXCFzBKnjj5SN84LHNps5grHtreS+gv6b17bu6o4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -26,7 +26,9 @@ buildGo125Module (finalAttrs: {
|
||||
make generate-mocks
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-BXFtw7+f9Isnk6EB3U4eLlho5B3rTnofmWBDbbbroUs=";
|
||||
vendorHash = "sha256-4j6qrYtIHkgQGHvWUt/+Mvwdzwnnkg2GAsQB1qgeJmw=";
|
||||
|
||||
excludedPackages = [ "test/flake" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "txtpbfmt";
|
||||
version = "0-unstable-2025-11-24";
|
||||
version = "0-unstable-2026-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protocolbuffers";
|
||||
repo = "txtpbfmt";
|
||||
rev = "fcb97cc64c7b79be3b13acde32afe2e1ab7563cf";
|
||||
hash = "sha256-cDNMMAEYOqEjX9UFX13YfGMZJFfwaaqkgpXkCvFx/L8=";
|
||||
rev = "a481f6a22f9426d6c2cc3d4be185b28d156886e4";
|
||||
hash = "sha256-5dX1hEq1VzzZdXaoxkyy/gCbB8u/wlwy8g9kScVmJZs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "4.19.12";
|
||||
version = "4.19.13";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "unciv";
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-rswc0ssIAF4AAGiGlGu2ls2ZG1oPzjJnd5j5CQb+Hsc=";
|
||||
hash = "sha256-8Y7ob7uC1hXESD2QnhbAUZQMCXSyroB9a3xO2o5sogc=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycontrol4";
|
||||
version = "1.6.0";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lawtancool";
|
||||
repo = "pyControl4";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8Sd39i/PPphGj3SI20ny5PkUU2D6QKMXn+zsRs9taLw=";
|
||||
hash = "sha256-CDo2tphWN62ZHz2nWa6oWWfzcPDhSLCu0B2NxEI8yMw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytibber";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zipHn6ZLRwRtvTKgJTrTSZwETviwLOPS8rMTRB3fErs=";
|
||||
hash = "sha256-+Df66Jmtfn5EMFBHrj603/rDZwYLlLQfihHr3vhhabI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -47,7 +47,8 @@ let
|
||||
mainProgram = if enableDFHack then "dfhack" else "dwarf-fortress";
|
||||
in
|
||||
buildEnv {
|
||||
name = "dwarf-fortress-full";
|
||||
pname = "dwarf-fortress-full";
|
||||
version = dfVersion;
|
||||
paths = [
|
||||
(dwarf-fortress.override {
|
||||
inherit
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
name = "legends-browser-${version}";
|
||||
version = "1.19.2";
|
||||
|
||||
jar = fetchurl {
|
||||
@@ -29,7 +28,8 @@ let
|
||||
in
|
||||
|
||||
buildEnv {
|
||||
inherit name;
|
||||
inherit version;
|
||||
pname = "legends-browser";
|
||||
paths = [ script ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "danielcherubini";
|
||||
domain = "elegoo_printer";
|
||||
version = "2.6.4";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielcherubini";
|
||||
repo = "elegoo-homeassistant";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qcIeApwwGQcmyJRIi2yyrsFocxtGsarZXVh9h+8yxew=";
|
||||
hash = "sha256-ka1KHO46JsO0MBrSzrwZcQglxvRJjzJNfkfXUaAeB04=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "sander1988";
|
||||
domain = "indego";
|
||||
version = "5.7.8";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sander1988";
|
||||
repo = "Indego";
|
||||
tag = version;
|
||||
hash = "sha256-7PQUsSPS+o5Vt4Do4/TXyGXAqyHJg96w8n7UMpZ0uFo=";
|
||||
hash = "sha256-yVzKHmxRWCsCcYu/HHwnEh3u9BDi3CngPk85sc/vIJo=";
|
||||
};
|
||||
|
||||
dependencies = [ pyindego ];
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
colmena,
|
||||
nix-update,
|
||||
nix-init,
|
||||
nurl,
|
||||
|
||||
storeDir ? "/nix/store",
|
||||
stateDir ? "/nix/var",
|
||||
@@ -143,6 +144,11 @@ let
|
||||
|
||||
nix-init = nix-init.override {
|
||||
nix = self.lix;
|
||||
inherit (self) nurl;
|
||||
};
|
||||
|
||||
nurl = nurl.override {
|
||||
nix = self.lix;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user