Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900
2025-11-11 02:12:12 +03:00
64 changed files with 397 additions and 2334 deletions
+7 -1
View File
@@ -588,7 +588,7 @@
adamperkowski = {
name = "Adam Perkowski";
email = "me@adamperkowski.dev";
matrix = "@xx0a_q:matrix.org";
matrix = "@adam:matrix.system72.dev";
github = "adamperkowski";
githubId = 75480869;
keys = [
@@ -1192,6 +1192,12 @@
githubId = 2335822;
name = "Alexandre Esteves";
};
alexland7219 = {
email = "alexland7219@gmail.com";
github = "alexland7219";
githubId = 58669111;
name = "Alexandre Ros";
};
alexnabokikh = {
email = "nabokikh@duck.com";
github = "alexnabokikh";
+2 -8
View File
@@ -83,10 +83,7 @@ let
secretPathOption =
with lib.types;
lib.mkOption {
type = nullOr (pathWith {
inStore = false;
absolute = true;
});
type = nullOr externalPath;
default = null;
internal = true;
};
@@ -142,10 +139,7 @@ in
};
options.sftp-private-key-file = lib.mkOption {
type = nullOr (pathWith {
inStore = false;
absolute = true;
});
type = nullOr externalPath;
default = null;
description = ''
SFTP private key file.
@@ -31,12 +31,7 @@ in
enable = lib.mkEnableOption "postgres-websockets";
pgpassFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/db_password";
description = ''
@@ -54,12 +49,7 @@ in
};
jwtSecretFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
example = "/run/keys/jwt_secret";
description = ''
Secret used to sign JWT tokens used to open communications channels.
+2 -12
View File
@@ -54,12 +54,7 @@ in
enable = lib.mkEnableOption "PostgREST";
pgpassFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/db_password";
description = ''
@@ -77,12 +72,7 @@ in
};
jwtSecretFile = lib.mkOption {
type =
with lib.types;
nullOr (pathWith {
inStore = false;
absolute = true;
});
type = with lib.types; nullOr externalPath;
default = null;
example = "/run/keys/jwt_secret";
description = ''
@@ -268,6 +268,7 @@ in
services.upower.enable = config.powerManagement.enable;
services.libinput.enable = mkDefault true;
services.geoclue2.enable = mkDefault true;
services.fwupd.enable = mkDefault true;
# Extra UDEV rules used by Solid
services.udev.packages = [
@@ -76,17 +76,11 @@ in
description = "Makes the bot mention @room when posting an alert";
};
tokenFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains a valid Matrix token for the Matrix user.";
};
secretFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains a secret for the Alertmanager webhook.";
};
};
@@ -15,10 +15,7 @@ in
extraOpts = {
package = mkPackageOption pkgs "prometheus-storagebox-exporter" { };
tokenFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
description = "File that contains the Hetzner API token to use.";
};
@@ -15,11 +15,7 @@ in
package = lib.mkPackageOption pkgs "cloudflare-dyndns" { };
apiTokenFile = lib.mkOption {
type = lib.types.pathWith {
absolute = true;
inStore = false;
};
type = lib.types.externalPath;
description = ''
The path to a file containing the CloudFlare API token.
'';
@@ -559,12 +559,7 @@ in
'';
};
encryptionPasswordFile = mkOption {
type = types.nullOr (
types.pathWith {
inStore = false;
absolute = true;
}
);
type = types.nullOr types.externalPath;
default = null;
description = ''
Path to encryption password. If set, the file will be read during
+1 -6
View File
@@ -55,12 +55,7 @@ in
'';
};
intermediatePasswordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
example = "/run/keys/smallstep-password";
description = ''
@@ -71,14 +71,7 @@ in
The contents of the specified paths will be read at service start time and merged with the attributes provided in `settings`.
'';
default = { };
type =
with lib.types;
nullOr (
attrsOf (pathWith {
inStore = false;
absolute = true;
})
);
type = with lib.types; nullOr (attrsOf externalPath);
};
settings = lib.mkOption {
+1 -4
View File
@@ -78,10 +78,7 @@ in
};
secretFile = lib.mkOption {
type = lib.types.pathWith {
inStore = false;
absolute = true;
};
type = lib.types.externalPath;
example = "/run/keys/oncall-dbpassword";
description = ''
A YAML file containing secrets such as database or user passwords.
+2 -12
View File
@@ -33,12 +33,7 @@ in
enable = lib.mkEnableOption "Photoprism web server";
passwordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
description = ''
Admin password file.
@@ -46,12 +41,7 @@ in
};
databasePasswordFile = lib.mkOption {
type = lib.types.nullOr (
lib.types.pathWith {
inStore = false;
absolute = true;
}
);
type = lib.types.nullOr lib.types.externalPath;
default = null;
description = ''
Database password file.
@@ -2285,8 +2285,8 @@ let
mktplcRef = {
name = "vscode-vibrancy-continued";
publisher = "illixion";
version = "1.1.61";
hash = "sha256-1LjAIMjk7JjLTf49QvDaLeGGDD5SUCLC3/41RfVVhEM=";
version = "1.1.62";
hash = "sha256-Urfa4XligTfFk6+GIuGabm5EFeQe+gRhdtb8IoXz+Ak=";
};
meta = {
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -5116,8 +5116,8 @@ let
mktplcRef = {
name = "vim";
publisher = "vscodevim";
version = "1.31.0";
hash = "sha256-97dQeCFm2i5uRF45k1tVMWiXNh5xBw3MVYM8MSIeDFE=";
version = "1.32.0";
hash = "sha256-qZYtCjqWoqE2qjrJN70ws9/w0FncLCWqTeVX/B66CmQ=";
};
meta = {
license = lib.licenses.mit;
@@ -489,13 +489,13 @@
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
},
"hashicorp_aws": {
"hash": "sha256-wavy4GE4VrXhDYqWAJsexxFPDM/Roo+YKp/DqVw8+jU=",
"hash": "sha256-YxN5bk0Us+LZlNMzt1/eh5I2gV77S/J+wt82WIGZvZU=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.19.0",
"rev": "v6.20.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
"vendorHash": "sha256-mTK19nqRGR7H45oUHgSC56KrAEJFIu/EocqBjY70fDY="
},
"hashicorp_awscc": {
"hash": "sha256-eaFzTQehn1nIq0Zl/8r2AtmPQnhh7X44q/6JVzIzX2A=",
@@ -570,13 +570,13 @@
"vendorHash": "sha256-BghusRVsU7HrX6hWpbanGJ93UdHSq8nWmcEGnyyVOTs="
},
"hashicorp_google-beta": {
"hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=",
"hash": "sha256-lL4BtInJu/STew7SaNrwPnmLDLucMvbyGanAK9tsJKE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"repo": "terraform-provider-google-beta",
"rev": "v7.9.0",
"rev": "v7.10.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
"vendorHash": "sha256-zLUlrIdfqhiVITQe7bmoYl570LvLS8aEMU2HC4xmKTU="
},
"hashicorp_helm": {
"hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=",
@@ -669,13 +669,13 @@
"vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
},
"hashicorp_vault": {
"hash": "sha256-5jx6a2BfnugD41D6iK7wvOzmMPImxNHCiIix4+puRp4=",
"hash": "sha256-xmi+79FoT8vXHJqMmIAIV+YcpZzAA40cNOxDOufJkro=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"repo": "terraform-provider-vault",
"rev": "v5.3.0",
"rev": "v5.4.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-qrztgFJ/WDTxP5565rnx2sAELFKQGOxFuEYqWQQYVVY="
"vendorHash": "sha256-zZUFUcgMQkbnh7It9k/7J/2KfiP1q3nlcC58xPb2bBo="
},
"hashicorp_vsphere": {
"hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
@@ -1147,13 +1147,13 @@
"vendorHash": null
},
"sacloud_sakuracloud": {
"hash": "sha256-kiAl/qdLbXzBCwgms3Y7TD/Ez2Hq0ifZ1SLVIPa9Bmk=",
"hash": "sha256-BNwGibmt6Ym8fqYtM3pB++Yo33LvOSBL+CY/FmSW/r0=",
"homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
"owner": "sacloud",
"repo": "terraform-provider-sakuracloud",
"rev": "v2.31.1",
"rev": "v2.31.2",
"spdx": "Apache-2.0",
"vendorHash": "sha256-BREv9hd6Oa/S8NjpRoLcF8uUFykEyffQO0LCuA3WFmc="
"vendorHash": "sha256-b1ziyrDKVUbTrN31t1IRFcK8EjsDSBP4FfArPkHKlBc="
},
"sap_btp": {
"hash": "sha256-55SNzeOaMyaidEbCjGPNF20qhQgddNHOl2xNqd7OZU4=",
@@ -350,12 +350,10 @@ rec {
${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions}
''
+ lib.optionalString (runtimeEnv != null) (
lib.concatStrings (
lib.mapAttrsToList (name: value: ''
${lib.toShellVar name value}
export ${name}
'') runtimeEnv
)
lib.concatMapAttrsStringSep "" (name: value: ''
${lib.toShellVar name value}
export ${name}
'') runtimeEnv
)
+ lib.optionalString (runtimeInputs != [ ]) ''
@@ -35,14 +35,15 @@ in
linkFarm "writeShellApplication-tests" {
test-meta =
let
script = writeShellApplication {
args = {
name = "test-meta";
text = "";
meta.description = "Test for the `writeShellApplication` `meta` argument";
};
script = writeShellApplication args;
in
assert script.meta.mainProgram == "test-meta";
assert script.meta.description == "A test for the `writeShellApplication` `meta` argument";
assert script.meta.mainProgram == args.name;
assert script.meta.description == args.meta.description;
script;
test-runtime-inputs = checkShellApplication {
@@ -1,23 +1,23 @@
{
buildNpmPackage,
fetchFromGitHub,
gitUpdater,
lib,
nix-update-script,
versionCheckHook,
}:
buildNpmPackage rec {
pname = "cfn-changeset-viewer";
version = "0.2.1";
version = "0.3.6";
src = fetchFromGitHub {
owner = "trek10inc";
repo = "cfn-changeset-viewer";
tag = version;
hash = "sha256-PPMmU5GMxxzBiTNAv/Rbtvkl5QK1BZjW4TJLT7xlpw4=";
hash = "sha256-hz1woGmJYOVGuu52DPPwkfbA49F/0hsxoAU6tiTvJx0=";
};
npmDepsHash = "sha256-ICaGtofENMaAjk/KGRn8RgpMAICSttx4AIcbi1HsW8Q=";
npmDepsHash = "sha256-NyWZ+8ArlUCsuBN5wZA9vnuX/3HFtuI42/V1+RIKom0=";
dontNpmBuild = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru.updateScript = gitUpdater { };
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI to view the changes calculated in a CloudFormation ChangeSet in a more human-friendly way";
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "doublecmd";
version = "1.1.29";
version = "1.1.30";
src = fetchFromGitHub {
owner = "doublecmd";
repo = "doublecmd";
tag = "v${finalAttrs.version}";
hash = "sha256-WEBCP5l9XZhule26thiti/NQpT0FPSu7b6ZffouHipQ=";
hash = "sha256-QEjwZ4jYkmgym4ap7GGD02O2yvEHFOw0jp6f65dfO+w=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,17 +8,17 @@
php.buildComposerProject2 (finalAttrs: {
pname = "drupal";
version = "11.2.5";
version = "11.2.7";
src = fetchFromGitLab {
domain = "git.drupalcode.org";
owner = "project";
repo = "drupal";
tag = finalAttrs.version;
hash = "sha256-y6oKz9ldj1jP6VYIzw0iqVQM5bMOY5UOj7Yf2rUk2fc=";
hash = "sha256-mLpdLMacj3ueY8e8YtBA+0D2HOIE2A25Gt3+1E5NqoA=";
};
vendorHash = "sha256-sBzh772IRZ1e84s6iBsTHPK2qdtMP91UqHYpLIofqwM=";
vendorHash = "sha256-s9pUsCJF8PJmiZRqLNEDulGu5fElaN8HVYk+3VtP6CY=";
composerNoPlugins = false;
passthru = {
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "eid-mw";
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.1.25";
version = "5.1.26";
src = fetchFromGitHub {
owner = "Fedict";
repo = "eid-mw";
tag = "v${finalAttrs.version}";
hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA=";
hash = "sha256-1dswXwXNTN3006KHnqlVntg6uHMxNe7NQ4BdKAB2FXM=";
};
postPatch = ''
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.86.0";
version = "1.87.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-AlpCTeopNfaN4IeumaEFTZNrBfIJH2RbfVoZaFRCy2Y=";
sha256 = "sha256-4AryuvgAlCm/Jci+s+XzpPTBB1A58o+gPrk2wgMzQW0=";
};
vendorHash = null;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "fanbox-dl";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "hareku";
repo = "fanbox-dl";
rev = "v${version}";
hash = "sha256-yrSA9CavQgu89hl+x578geC35KvamfAPOSg33woVI8w=";
hash = "sha256-vXKiShP8RdIT8pRhDkO5K3fBVHQZ9nXv5GAhZaEXj8E=";
};
vendorHash = "sha256-uhNitrJeFuFG2XyQrc1JBbExoU6Ln6AFRO2Bgb1+N5M=";
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "innernet";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "tonarino";
repo = "innernet";
tag = "v${version}";
hash = "sha256-9rw+hS4qwAL6adDzi2Hfl4TQBDWvPKjwpkbRCBKzwEY=";
hash = "sha256-wGxTdoWMHVUldW+bjli+5zqo3PRU/8tn7fxAeVrynjs=";
};
cargoHash = "sha256-MM6sYNmd/i8ba6WRLMsQWR3+KEc2o8Io+gAN9RjYj5E=";
cargoHash = "sha256-vDPs+EEl/ZbKxOrNHc86N7+5ij+4YmsZRo5/Sxja6ms=";
nativeBuildInputs = [
rustPlatform.bindgenHook
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "jj-pre-push";
version = "0.3.0";
version = "0.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "acarapetis";
repo = "jj-pre-push";
tag = "v${version}";
hash = "sha256-nWkMXXlzJeXz0kHBuN4g8YWW6JmwrfE/y9oFfEOqeQk=";
hash = "sha256-/fh06T7kTlyyzj+ez9JkbU5h80Ez9B0nwZ/znjwTUJg=";
};
build-system = [
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "jx";
version = "3.16.26";
version = "3.16.28";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-KydLlc2FaOVdnz3ZP6obR7KbdWK0I5WXTziKAH3/UtY=";
sha256 = "sha256-BcT0zb4/TQPr3iwr3E72hPYbh0Oy+QZFD9zcX5ipNMA=";
};
vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0=";
+2 -2
View File
@@ -5,12 +5,12 @@
}:
buildGoModule rec {
pname = "lsh";
version = "1.5.0";
version = "1.5.3";
src = fetchFromGitHub {
owner = "latitudesh";
repo = "lsh";
rev = "v${version}";
sha256 = "sha256-VsOahtc2KFTBjkbE1Raq1ho/fMifALBHVhoJyY85MJ8=";
sha256 = "sha256-W+0yuBfDjHNMEaf+T0FSVMzRyZgkeXrFwsY47ksDD5U=";
};
vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU=";
subPackages = [ "." ];
+2 -2
View File
@@ -21,13 +21,13 @@ assert (
stdenv.mkDerivation rec {
pname = "mctc-lib";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "grimme-lab";
repo = "mctc-lib";
rev = "v${version}";
hash = "sha256-MWqvFxFGnFrGppiSy97oUWz7p1sD6GkTrMEZTFgSExg=";
hash = "sha256-rlwUNeuLzgSWZXDKCFS/H82+oH23tEzhhILqC/ZV6PI=";
};
patches = [
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "moor";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "walles";
repo = "moor";
tag = "v${finalAttrs.version}";
hash = "sha256-VipHPRxSre6U3VXNtP+NrlaVfgUkzIDLvg4UsZucAdY=";
hash = "sha256-c2ypM5xglQbvgvU2Eq7sgMpNHSAsKEBDwQZC/Sf4GPU=";
};
vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "mtail";
version = "3.2.23";
version = "3.2.24";
src = fetchFromGitHub {
owner = "jaqx0r";
repo = "mtail";
rev = "v${version}";
hash = "sha256-UxEqPCQDtdVQXPgAOhzUMwXC8NWTSsHDrVLIUzfz5OA=";
hash = "sha256-eRcVpnXc0H/yt5yD693rsT14xzAw0T3QqvhpxqHzn1E=";
};
vendorHash = "sha256-uT0waytDtFavvf6v4lmMAjiX8Dd7GRx54k8L/pOjWNc=";
vendorHash = "sha256-fbsITz+Xn0xxol9ismRDl16BW8trwdSGrehX5sClhdw=";
nativeBuildInputs = [
gotools # goyacc
+48
View File
@@ -0,0 +1,48 @@
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
version = "2.1";
src = fetchFromGitHub {
owner = "kyx0r";
repo = "nextvi";
tag = finalAttrs.version;
hash = "sha256-FBUcmCkGOf7HVLkZqHWxHxS0qhz5t9VwbWb0VOGnb28=";
};
nativeBuildInputs = [ installShellFiles ];
buildPhase = ''
runHook preBuild
sh ./cbuild.sh
runHook postBuild
'';
installPhase = ''
runHook preInstall
PREFIX=$out sh ./cbuild.sh install
mv $out/bin/{vi,nextvi}
installManPage --name nextvi.1 vi.1
runHook postInstall
'';
meta = {
description = "Next version of neatvi (a small vi/ex editor)";
homepage = "https://github.com/kyx0r/nextvi";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "nextvi";
};
})
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "nvidia-modprobe";
version = "580.95.05";
version = "580.105.08";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-modprobe";
rev = version;
hash = "sha256-2guTV77XY8yV9TmwbM17zQGYygv7kgzkX4cyGWqSuV4=";
hash = "sha256-orOFwL9mrmqPqMorUOZlBTMEraAqYCf+2XTD9DuMeSk=";
};
nativeBuildInputs = [ gnum4 ];
+30 -5
View File
@@ -18,6 +18,11 @@
cudaArches ? cudaPackages.flags.realArches or [ ],
autoAddDriverRunpath,
apple-sdk_15,
vulkan-tools,
vulkan-headers,
vulkan-loader,
shaderc,
ccache,
versionCheckHook,
writableTmpDirAsHomeHook,
@@ -29,7 +34,7 @@
ollama-cuda,
config,
# one of `[ null false "rocm" "cuda" ]`
# one of `[ null false "rocm" "cuda" "vulkan" ]`
acceleration ? null,
}:
@@ -38,6 +43,7 @@ assert builtins.elem acceleration [
false
"rocm"
"cuda"
"vulkan"
];
let
@@ -50,9 +56,11 @@ let
rocmRequested = shouldEnable "rocm" config.rocmSupport;
cudaRequested = shouldEnable "cuda" config.cudaSupport;
vulkanRequested = shouldEnable "vulkan" false;
enableRocm = rocmRequested && stdenv.hostPlatform.isLinux;
enableCuda = cudaRequested && stdenv.hostPlatform.isLinux;
enableVulkan = vulkanRequested && stdenv.hostPlatform.isLinux;
rocmLibs = [
rocmPackages.clr
@@ -75,6 +83,11 @@ let
cudaPackages.cuda_cccl
];
vulkanLibs = [
vulkan-headers
vulkan-loader
];
# Extract the major version of CUDA. e.g. 11 12
cudaMajorVersion = lib.versions.major cudaPackages.cuda_cudart.version;
@@ -103,6 +116,9 @@ let
]
++ lib.optionals enableCuda [
"--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'"
]
++ lib.optionals enableVulkan [
"--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib vulkanLibs)}'"
];
wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
@@ -111,6 +127,8 @@ let
buildGoModule.override { stdenv = cudaPackages.backendStdenv; }
else if enableRocm then
buildGoModule.override { stdenv = rocmPackages.stdenv; }
else if enableVulkan then
buildGoModule.override { stdenv = vulkan-tools.stdenv; }
else
buildGoModule;
inherit (lib) licenses platforms maintainers;
@@ -137,7 +155,8 @@ goBuild (finalAttrs: {
CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include";
CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include";
}
// lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; };
// lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; }
// lib.optionalAttrs enableVulkan { VULKAN_SDK = shaderc.bin; };
nativeBuildInputs = [
cmake
@@ -151,12 +170,16 @@ goBuild (finalAttrs: {
++ lib.optionals (enableRocm || enableCuda) [
makeBinaryWrapper
autoAddDriverRunpath
]
++ lib.optionals enableVulkan [
ccache
];
buildInputs =
lib.optionals enableRocm (rocmLibs ++ [ libdrm ])
++ lib.optionals enableCuda cudaLibs
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]
++ lib.optionals enableVulkan vulkanLibs;
# replace inaccurate version number with actual release version
postPatch = ''
@@ -261,11 +284,13 @@ goBuild (finalAttrs: {
description =
"Get up and running with large language models locally"
+ lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration"
+ lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration";
+ lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"
+ lib.optionalString vulkanRequested ", using Vulkan for generic GPU acceleration";
homepage = "https://github.com/ollama/ollama";
changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}";
license = licenses.mit;
platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix;
platforms =
if (rocmRequested || cudaRequested || vulkanRequested) then platforms.linux else platforms.unix;
mainProgram = "ollama";
maintainers = with maintainers; [
abysssol
+54
View File
@@ -0,0 +1,54 @@
{
stdenv,
lib,
fetchFromGitHub,
qt6,
installShellFiles,
}:
stdenv.mkDerivation rec {
pname = "qusb2snes";
version = "0.7.35";
src = fetchFromGitHub {
owner = "Skarsnik";
repo = "QUsb2snes";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-521L4awWr4L2W12vAZUMheq4plXUXKYo4d3S6AfHgPA=";
};
nativeBuildInputs = [
qt6.qmake
qt6.wrapQtAppsHook
installShellFiles
];
buildInputs = [
qt6.qtbase
qt6.qtwebsockets
qt6.qtserialport
];
qmakeFlags = [
"QUsb2snes.pro"
"CONFIG+=release"
];
installPhase = ''
runHook preInstall
installBin QUsb2Snes
installManPage --name QUsb2Snes.1 QUsb2Snes.manpage.1
install -Dm644 ui/icons/cheer128x128.png $out/share/icons/hicolor/128x128/apps/fr.nyo.QUsb2Snes.png
install -Dm644 QUsb2Snes.desktop $out/share/applications/fr.nyo.QUsb2Snes.desktop
runHook postInstall
'';
meta = {
description = "Websocket server that provides a unified protocol for accessing SNES (or SNES emulators) software";
license = lib.licenses.gpl3Plus;
homepage = "https://skarsnik.github.io/QUsb2snes/";
platforms = lib.platforms.linux;
badPlatforms = lib.platforms.darwin;
mainProgram = "QUsb2Snes";
maintainers = with lib.maintainers; [ alexland7219 ];
};
}
+3 -3
View File
@@ -17,14 +17,14 @@
python3Packages.buildPythonApplication {
pname = "ranger";
version = "1.9.3-unstable-2025-11-01";
version = "1.9.3-unstable-2025-11-05";
format = "setuptools";
src = fetchFromGitHub {
owner = "ranger";
repo = "ranger";
rev = "6b646df44604fac6b7843119833a696789d6f3f3";
hash = "sha256-6zypE/i+lANPP8z7ILgPWgwCFXXhxi2s+RLgctsId5Q=";
rev = "f28690ef42778eb7982e2b309a2cc8d99f682eb4";
hash = "sha256-ZmUHHFth1jvMsyJ8XWRbLjoJnowRPZivFTim1VLh8hc=";
};
LC_ALL = "en_US.UTF-8";
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "rasm";
version = "2.3.9";
version = "3.0";
src = fetchFromGitHub {
owner = "EdouardBERGE";
repo = "rasm";
rev = "v${version}";
hash = "sha256-vTN9EmqfSZh8ecHlaSCi6qgsKtZBh8qr0vaqyiP5R9I=";
hash = "sha256-pRDfaQVqR7OVwSKh2dMU4QjEb5SGQ2eoG8g9aUJwrXU=";
};
# by default the EXEC variable contains `rasm.exe`
+3 -3
View File
@@ -23,16 +23,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ripgrep-all";
version = "0.10.9";
version = "0.10.10";
src = fetchFromGitHub {
owner = "phiresky";
repo = "ripgrep-all";
rev = "v${version}";
hash = "sha256-r/+u76Qxat6U0Hb3Xh31K/F0dNSPzteFzoE69NNCerI=";
hash = "sha256-fDSetB2UGzth+3KkCKsXUHj3y08RSfQ2nCKDa8OurW4=";
};
cargoHash = "sha256-nTCqqTFt87snzOXkjablaX9ZMGu/s88ZnUVr5uYrzPs=";
cargoHash = "sha256-v+lLCI2ti/xL8hcGkm/xDDN9qk0G9MgtijE8xYnhC68=";
# override debug=true set in Cargo.toml upstream
RUSTFLAGS = "-C debuginfo=none";
+3 -3
View File
@@ -10,15 +10,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sftool";
version = "0.1.14";
version = "0.1.15";
src = fetchFromGitHub {
owner = "OpenSiFli";
repo = "sftool";
tag = finalAttrs.version;
hash = "sha256-xheGgtE9hZVNa4ceqQCrfiYJwlIuXm00J//0VeZ/afE=";
hash = "sha256-1MNX90qxHyJ5YS6CyIA5TL7JqDyDtgLATJA7qCEJrvI=";
};
cargoHash = "sha256-pimr4OL709EWIoLk/Wq+QAiveLyR/V70nPuzYfZSH/o=";
cargoHash = "sha256-5M44L2EMQ/SIgLbNSGftVsECNSQg2lV6UJmiHROMv7o=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdjson";
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
tag = "v${finalAttrs.version}";
hash = "sha256-N3NPE9R8VipspCwH2dY339WUGt51aqkYpLTr/PPVRQ4=";
hash = "sha256-EuineRyNSwWoMRuev6ZFQNeFgSHjuoHhoGhYD0ls6GQ=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "stgit";
version = "2.5.4";
version = "2.5.5";
src = fetchFromGitHub {
owner = "stacked-git";
repo = "stgit";
rev = "v${version}";
hash = "sha256-Tsh2VKnJUwxsrsSOKxJwcFIY8UZ9F7Ebi9lwe03fJZs=";
hash = "sha256-zl3xy4t15QwdHeo0cjtorOcmD6oerprUswoMubpVLGU=";
};
cargoHash = "sha256-RiPLBK7CiotCduaYYbS3vkb9ezNwfbbx+QC4DGd3diU=";
cargoHash = "sha256-HPwKKh2QAG690u5pVIIp6Mu6ejaXmIuSuzMLt2tvwhw=";
nativeBuildInputs = [
pkg-config
File diff suppressed because it is too large Load Diff
@@ -1,31 +1,73 @@
{
lib,
buildNpmPackage,
fetchurl,
stdenv,
fetchFromGitHub,
pnpm,
nodejs,
makeBinaryWrapper,
nix-update-script,
}:
let
version = "0.17.21";
in
buildNpmPackage {
stdenv.mkDerivation (finalAttrs: {
pname = "svelte-language-server";
inherit version;
version = "0.17.21";
src = fetchurl {
url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
hash = "sha256-zRUeAocuEyoaBUrCDkqxJhMY7ryv9y7hYQC5/CsL2NM=";
src = fetchFromGitHub {
owner = "sveltejs";
repo = "language-tools";
tag = "svelte-language-server@${finalAttrs.version}";
hash = "sha256-HNd4M7bFTN0oFdO44w8Rgz45mDLrJ/ksZKB0iPw6t1s=";
};
npmDepsHash = "sha256-0nad0gdQhl3nwHbmDyLCfnIfgn4ixBbZn/oy3THDniw=";
pnpmWorkspaces = [ "svelte-language-server..." ];
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
fetcherVersion = 2;
hash = "sha256-J279yrHRyG6QyUedXmYwv6Kcuz/9pGwvu6dUELIFeu8=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
makeBinaryWrapper
];
buildPhase = ''
runHook preBuild
pnpm run --filter=svelte-language-server... build
runHook postBuild
'';
dontNpmBuild = true;
installPhase = ''
runHook preInstall
npmFlags = [ "--legacy-peer-deps" ];
pnpm install --filter=svelte-language-server... --prod --frozen-lockfile --offline --force --ignore-scripts
mkdir -p $out/lib/node_modules/svelte-language-server/
mkdir -p $out/bin
passthru.updateScript = ./update.sh;
mv {packages,node_modules} $out/lib/node_modules/svelte-language-server/
makeWrapper ${lib.getExe nodejs} $out/bin/svelteserver \
--add-flags "$out/lib/node_modules/svelte-language-server/packages/language-server/bin/server.js" \
--set NODE_PATH "$out/lib/node_modules/svelte-language-server/packages/language-server/node_modules/"
runHook postInstall
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--use-github-releases"
"--version-regex"
"svelte-language-server@(.*)"
];
};
meta = {
description = "Language server (implementing the language server protocol) for Svelte";
@@ -35,4 +77,4 @@ buildNpmPackage {
mainProgram = "svelteserver";
maintainers = [ ];
};
}
})
@@ -1,30 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget
set -euo pipefail
pushd "$(dirname "${BASH_SOURCE[0]}")"
version=$(npm view svelte-language-server version)
tarball="svelte-language-server-$version.tgz"
url="https://registry.npmjs.org/svelte-language-server/-/$tarball"
if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
echo "Already up to date!"
exit 0
fi
sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix
sha256=$(nix-prefetch-url "$url")
src_hash=$(nix-hash --type sha256 --to-sri "$sha256")
sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
rm -f package-lock.json package.json *.tgz
wget "$url"
tar xf "$tarball" --strip-components=1 package/package.json
npm i --package-lock-only
npm_hash=$(prefetch-npm-deps package-lock.json)
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
rm -f package.json *.tgz
popd
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "tanka";
version = "0.35.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "tanka";
rev = "v${version}";
sha256 = "sha256-Jghw2KfHNl2VoGQYE/kadvcgXMIVP9SOsvT2ltWrQSs=";
sha256 = "sha256-UsmeVLCgZeNRoqOYwbwIzWCFtLDgXyojNzA63VvBTc8=";
};
vendorHash = "sha256-rms/aUchtcjsjeS51SB2eKPOTRoYOLDGbrmhRld6gUo=";
vendorHash = "sha256-jXIDECIW9xnct8bAxsvoMGpdwZuKCLCuCbuTM2dgXik=";
doCheck = false;
# Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK
+4 -4
View File
@@ -10,14 +10,14 @@ let
platform =
if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
hash = builtins.getAttr platform {
"universal-macos" = "sha256-4lpJxXRwngBUdImBrIeuLVU6GJr6n6g/71bueuZTFj8=";
"x86_64-linux" = "sha256-5rJHyFRrU5N5wYIohISBRuwH7WfrSDUyHHmCppSvcfM=";
"aarch64-linux" = "sha256-CSB6PGr/EGV/ZdxfWMwY/R9/pObQRSASYE3Cp4cm1/E=";
"universal-macos" = "sha256-OkI7V3cGQv++jb9Y7mGSYZsTq/kzZ/bhM88Ol9XrqJ8=";
"x86_64-linux" = "sha256-3BxKah022TRJZ8QstUq+sgykTA+wJ6HfyzS6x2+IF+U=";
"aarch64-linux" = "sha256-sbnWYIMJZTKDwIT+mpnjiGyX1GnyQbYMckKklMtLfDc=";
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tigerbeetle";
version = "0.16.62";
version = "0.16.63";
src = fetchzip {
url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
+2 -2
View File
@@ -9,13 +9,13 @@ let
running in development environment and try to serve assets from the
source tree, which is not there once build completes.
*/
version = "0.35.1";
version = "0.35.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = "tilt";
tag = "v${version}";
hash = "sha256-rM5INMOECbnuWd4ealBcIuMwZij7MthrXfohOBavl8Y=";
hash = "sha256-QHW2lX92Yj43BwhAfHDLPXTeyrnRjaWs64GpXMzEzAk=";
};
};
+2 -2
View File
@@ -7,12 +7,12 @@
python3Packages.buildPythonApplication rec {
pname = "tmuxp";
version = "1.55.0";
version = "1.56.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-reC609nY1kdmQInAphAfmSTZQQqitTD88EBv/4mU3h0=";
hash = "sha256-6Nc6JHNZM6OUgoOfpD4wCDUlLAb2kLBplm1IjuVG/q8=";
};
build-system = with python3Packages; [
+2 -2
View File
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.84.11";
version = "2.84.16";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-x42s6h0niDUnFqqi/t8Mn/FdncivlI7ApTmo6TIx1aE=";
hash = "sha256-E2lbKPWy4KfBqAI+BC7pc0F/U4qf63nLGeIKmIfURX4=";
};
postPatch = ''
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttdl";
version = "4.12.0";
version = "4.13.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
sha256 = "sha256-nA5fX8NZko49ctgwJOt0A07/7SFyM5I2840zeBZnFCs=";
sha256 = "sha256-A3hzGBimQ2p4AjCKCHQaEe2U6GUaoTZdDEzmUcJuTfA=";
};
cargoHash = "sha256-yCEdsxoKxudI7ae8Lz+8TAFblJSSB4tSD3GLdT6VtFI=";
cargoHash = "sha256-NpV7SxRrLREtpyB59mdLk3KoGOIMvsxs71eQqKgo6EY=";
meta = {
description = "CLI tool to manage todo lists in todo.txt format";
+3 -3
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.1-alpha.25";
version = "0.0.1-alpha.26";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-roN8sU0WjGXd1jfQiTXSJ0OQRW8MbNYUfCdz744lnRM=";
hash = "sha256-ykkOCFNtEqtEqzjiC/MnxM6X02VtToz5bSqtxCKa418=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
cargoHash = "sha256-A2lPCweusmDPwh6IXAj4D6+GRK6CaZSP5gFDhrsBI5Q=";
cargoHash = "sha256-7bGmTQ5+tqju6aA5t81zbW5mhrBzMtdp+02y2I1eMBI=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -18,13 +18,13 @@
}:
let
pname = "v2raya";
version = "2.2.7.3";
version = "2.2.7.4";
src = fetchFromGitHub {
owner = "v2rayA";
repo = "v2rayA";
tag = "v${version}";
hash = "sha256-tgSZJGHkpQGhja5C62w6QpflYBBtt3rPCCPT+3yTzm4=";
hash = "sha256-Dr9RKVGt5zjUOVwUAXe2m8F29Z64BhyrmuLYGwZMd0A=";
postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
};
+3 -3
View File
@@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "velocity";
version = "3.4.0-unstable-2025-10-23";
version = "3.4.0-unstable-2025-11-09";
src = fetchFromGitHub {
owner = "PaperMC";
repo = "Velocity";
rev = "b6b6b20fe97cd9cb0d6b4e817d3e7db72aca2d8d";
hash = "sha256-UHkioSGKikYxHq/petnJSHpvx/ioH01N6FSl0176YVA=";
rev = "6cc1be7746ec49d2b600b1af1dcec99584750d38";
hash = "sha256-zDB9bIkclEBf+NdBkufmsmKM8Qo8uqeZ26OUdyzczi8=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation {
pname = "wdt";
version = "1.27.1612021-unstable-2025-09-18";
version = "1.27.1612021-unstable-2025-11-07";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "42ec3e543655a4ca91052e9cd75f8fa6ebc4a817";
sha256 = "sha256-VuK8zYCcpdS+FQU3/owPEdXH+R2aTao2nMnKOWw1rTM=";
rev = "8e9e24e747192354de66993af463be76b28c4468";
sha256 = "sha256-B3eVZLgeSR/texyy152eRMs/WDCY5CW1tzGS4FynCjQ=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "wxsqlite3";
version = "4.10.12";
version = "4.11.0";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
hash = "sha256-3t8SQJdB7ivuCnsr5TxmgslQNkvz+O/mE3NB+R/kXHM=";
hash = "sha256-cTErixQhAruU/mpxnG4Nio4PPtxSeGeNZNHTjZlyn+M=";
};
enableParallelBuilding = true;
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
version = "2.3.5.1";
version = "2.3.5.2";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = "yoshimi";
rev = version;
hash = "sha256-A6laO4JhYFjuqBYmaQzZduHbDwdC+8zAVPqifbpJ8JQ=";
hash = "sha256-X4g4AhPHg2ezHnAm8fWunatZgr3/PZxibzACplWogo8=";
};
sourceRoot = "${src.name}/src";
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "django-filer";
version = "3.3.2";
version = "3.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "django-cms";
repo = "django-filer";
tag = version;
hash = "sha256-XB+imTAcWCj9C6bNAo+uEdrshYKBlhxYXT37l92VW9M=";
hash = "sha256-EAiqGRdmUii86QwHkZ2BT5vBRaiXpNWbr9INmuYW444=";
};
build-system = [ setuptools ];
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "playwrightcapture";
version = "1.34.1";
version = "1.34.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Lookyloo";
repo = "PlaywrightCapture";
tag = "v${version}";
hash = "sha256-cywGV1hlxdZ9xU5adHKiZr2npdUpNkdF9sk9pykPFE8=";
hash = "sha256-wM4GoS9XiszlOMbwQ11JBWXVexspYgRPws4EnwiZ078=";
};
pythonRelaxDeps = [
@@ -12,35 +12,35 @@
},
"37": {
"hashes": {
"aarch64-darwin": "20cf3973cfab6cde93904209845d620d3221fd49bbf39918ed28fb140d0a8e6a",
"aarch64-linux": "15e237fb17f7d6bfefabee229d1585204db0d7e230c118a3d5ce8fd49af7405d",
"armv7l-linux": "14278dd5061358521133addd0e025e466f8012640e390753df2fa92f13eae451",
"headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
"x86_64-darwin": "ca911295a582114438f9977e4aef18a42782da0b1fd5627cc1bf7744b2548a88",
"x86_64-linux": "aebb0b0d7c1cb7673753766219cd828cbf6c2e86e8b29a9571284d0f7cbc963d"
"aarch64-darwin": "5d953398aeb0a578f724d18755f693c8cd32125812c3e6a6f3c9ec90bdfa414a",
"aarch64-linux": "35e969cc0a4e779011f314311db07244235f5b2a8db9284bf0061ece7084f6dd",
"armv7l-linux": "015c9caf6bb919b73b5118a56f260746ec4ca1ae8c5008e3591d562a6f4c5aee",
"headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5",
"x86_64-darwin": "44b845bc1cac455d800cec2df1be3e72af0a3a4c54e933c803f30ab12600ffea",
"x86_64-linux": "e5b45933bca6acbf24a52452c976a30f5ac2614d0f08b00b7202b90efba1bc96"
},
"version": "37.7.1"
"version": "37.9.0"
},
"38": {
"hashes": {
"aarch64-darwin": "0895d02b29b26f33fc984aa0fc06005093f6128343ecce42da89855c14c22aac",
"aarch64-linux": "e4567921b645c8c396835b5ba2144bd104d04a7be1582bb937c53fed21170a0d",
"armv7l-linux": "c485210cb616057d04ee8537308c2aec76581554e793d4f5e8da0e04a1b6105c",
"headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
"x86_64-darwin": "483b6185c9a0e24eed8a8d5dfcc6fdfb22790f21dc84434083fd75f998f361f3",
"x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2"
"aarch64-darwin": "2add03400a735823e827b5671c52d877338b08fd4733dba210b35f99d6346f24",
"aarch64-linux": "99fe2c76ef1571da036d4610a6f49de1aa16ea4735b0b20da1d026668d70d629",
"armv7l-linux": "25cbecb533ff355e85c6760729dfd822fd27c6d50a36cab800d3d07af603295a",
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
"x86_64-darwin": "6a36e577156907ea15ca1cd393c90f0a60bebf01ca9c3414b7e76f4bb8b2d6f4",
"x86_64-linux": "b48627d5ce7b533170363e750d7292ecc489bce61ec2b933b9d4705c53166545"
},
"version": "38.4.0"
"version": "38.6.0"
},
"39": {
"hashes": {
"aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70",
"aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43",
"armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e",
"headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
"x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5",
"x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f"
"aarch64-darwin": "90bfac2ec51c73a2f82d3b6f72ef69acb4b260cfe09106c1c0cc84389438ba27",
"aarch64-linux": "67c257ada60b8ee5107d4c3c3912ece8d8c1383321a00fda114ade06860e4b3f",
"armv7l-linux": "45305e3f1927fa87593802906d620057c093ce56d970dcf3e698a7ae672e0dcc",
"headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v",
"x86_64-darwin": "3da533366600e21bd882512285d3583fe7a58457897c7a2dc49634f76056714d",
"x86_64-linux": "d4e492de3e0dd240746bcc54c2abf2b941f1657e06f07b87937bee516cf6fa59"
},
"version": "39.0.0"
"version": "39.1.1"
}
}
@@ -12,35 +12,35 @@
},
"37": {
"hashes": {
"aarch64-darwin": "fba6e9342f6414f08bb49466a8cb7028b44042342a64b55a212565af3b674bfb",
"aarch64-linux": "c4ee6ff8d3a3a96217557360bda4271fb49ab2383b8962f458fa0b6dc77ff8e2",
"armv7l-linux": "1c9d6799f14c14699fee37af08af515777f4da436b9998ba74a69613e7e957da",
"headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
"x86_64-darwin": "066d453bd62f02ecb1ddf10cfb064e6200c2af1842bd5963546f37c03eebd426",
"x86_64-linux": "2ce28af3e7481126d5dd9dcacdeeed39778a28892e5c594b10c0cfba06400ddb"
"aarch64-darwin": "1e2b6822ec49e253f765b34e5078f8261df0fcb086c7a8bfbbebdd35bdb8801e",
"aarch64-linux": "66877c9863c967dc435fa18e5177673b9f9e139bd73981c5945d92546d71a5ea",
"armv7l-linux": "deedf5b7f387721b4bcb9cea274ceaf7625852f88f3217eabd2104f42259f8be",
"headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5",
"x86_64-darwin": "e367440fdc5c915cd137c49ddd2912bda893996da6d14f1d678f02bcb726b135",
"x86_64-linux": "62ae1633d05f165d4ee42c2d6675f46db8cb55714433fddb5cb082dc9e40bffb"
},
"version": "37.7.1"
"version": "37.9.0"
},
"38": {
"hashes": {
"aarch64-darwin": "7249795788e05d625944f0c0234928eb8176ff0ac03177628d06606975bcfbbe",
"aarch64-linux": "f47d45fb8c153fee979564bca8491e2588f0848f03087bb38573ebfbe62e63aa",
"armv7l-linux": "36c65512c5eec0ab9741a06e91b38a503de00c1e39cf177db676f5c665f357f4",
"headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
"x86_64-darwin": "e3a3dfc38b5f45ad884d2ac8eb165331247c5dbed030f925508fc8ff95a53f1e",
"x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892"
"aarch64-darwin": "b625e3ca3e66a79a63a35c7ca2e199172237387d4739e107620485f83c8dff46",
"aarch64-linux": "118b35d04d28f63a10dd3f80f809648e0507f381f889130e9a9cc8e1d1d8dec4",
"armv7l-linux": "f5cab868e2da285d60595c7df7cc29595070c4078993516a5f55d674b4b16b7c",
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
"x86_64-darwin": "a05015b38f4b6b25d874a5e2bd82c04813e27c34e3611fab8919af772c0e8a55",
"x86_64-linux": "1e087810c35b86e077a14464eaead73a8ec64eaa0e1107ac81828a985455aa70"
},
"version": "38.4.0"
"version": "38.6.0"
},
"39": {
"hashes": {
"aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c",
"aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36",
"armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74",
"headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
"x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943",
"x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de"
"aarch64-darwin": "555c0c1456b3cfed09b79569fc1e6d9644cb1c1ee2c6d176ed3ee9380cca963e",
"aarch64-linux": "5a45ad3b6d62db31f94e16ea323d559a5380b92730032e106cf602f9258b8d0b",
"armv7l-linux": "478fe206d431297acbff3a4cfd95df7e864ab29971a883c9518b1a4b476a14fb",
"headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v",
"x86_64-darwin": "af7656f7a1d29568ea820ae50f6b32c6db12b49382037a705524986c389d25cf",
"x86_64-linux": "23122cda6e264f716483fe00d9c085d2faad7fe2acd1cfbc6a301f54e80c44ac"
},
"version": "39.0.0"
"version": "39.1.1"
}
}
+27 -27
View File
@@ -56,10 +56,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-gq7gu3ZhV2W02oQUtRFSAJfcCchB8zflqexllmg9GCU=",
"hash": "sha256-k+YDahI53rwe8o4EjrFfSWTbplUMJemN52+O4ICtz8M=",
"owner": "electron",
"repo": "electron",
"tag": "v37.7.1"
"tag": "v37.9.0"
},
"fetcher": "fetchFromGitHub"
},
@@ -393,10 +393,10 @@
},
"src/third_party/electron_node": {
"args": {
"hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
"hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=",
"owner": "nodejs",
"repo": "node",
"tag": "v22.20.0"
"tag": "v22.21.1"
},
"fetcher": "fetchFromGitHub"
},
@@ -1328,11 +1328,11 @@
},
"electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
"modules": "136",
"node": "22.20.0",
"version": "37.7.1"
"node": "22.21.1",
"version": "37.9.0"
},
"38": {
"chrome": "140.0.7339.240",
"chrome": "140.0.7339.249",
"chromium": {
"deps": {
"gn": {
@@ -1341,15 +1341,15 @@
"version": "0-unstable-2025-07-29"
}
},
"version": "140.0.7339.240"
"version": "140.0.7339.249"
},
"chromium_npm_hash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=",
"deps": {
"src": {
"args": {
"hash": "sha256-lO84baZNQgchjmLnSUQ4y2Yi1MEH8d0omB612F4vCxM=",
"hash": "sha256-ny2ZfcFpdt53+UbjZExBPpxZ/SJts/3DfxgFqbz4QfI=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"tag": "140.0.7339.240",
"tag": "140.0.7339.249",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@@ -1388,10 +1388,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-HKUJyRtN5I/xOKyTfP3bHTwZ6AmpbWVzfT4BR3t9SOQ=",
"hash": "sha256-zrShSv6a2TCaMR90dfsN//PWsthHtz8m5awwNFur6hM=",
"owner": "electron",
"repo": "electron",
"tag": "v38.4.0"
"tag": "v38.6.0"
},
"fetcher": "fetchFromGitHub"
},
@@ -1725,10 +1725,10 @@
},
"src/third_party/electron_node": {
"args": {
"hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
"hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=",
"owner": "nodejs",
"repo": "node",
"tag": "v22.20.0"
"tag": "v22.21.1"
},
"fetcher": "fetchFromGitHub"
},
@@ -2652,11 +2652,11 @@
},
"electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
"modules": "139",
"node": "22.20.0",
"version": "38.4.0"
"node": "22.21.1",
"version": "38.6.0"
},
"39": {
"chrome": "142.0.7444.52",
"chrome": "142.0.7444.59",
"chromium": {
"deps": {
"gn": {
@@ -2665,15 +2665,15 @@
"version": "0-unstable-2025-09-18"
}
},
"version": "142.0.7444.52"
"version": "142.0.7444.59"
},
"chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=",
"deps": {
"src": {
"args": {
"hash": "sha256-/gjznJOMyWs7kaUquYf4c1peCi3P6LQXnHUGdLROtz4=",
"postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"tag": "142.0.7444.52",
"hash": "sha256-E2nxJzxjFu3pBeBptqBHNnguiBeI4tg76uLNOzitM+U=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
"tag": "142.0.7444.59",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"fetcher": "fetchFromGitiles"
@@ -2712,10 +2712,10 @@
},
"src/electron": {
"args": {
"hash": "sha256-yAV/co8euqwTeUg43nnKwYF0/NQIm2WVh7CWOeP8vyE=",
"hash": "sha256-1unNLuIek76p05+Jz/oKmc4/rUtAU6W37I7SnTV3UnE=",
"owner": "electron",
"repo": "electron",
"tag": "v39.0.0"
"tag": "v39.1.1"
},
"fetcher": "fetchFromGitHub"
},
@@ -3049,10 +3049,10 @@
},
"src/third_party/electron_node": {
"args": {
"hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
"hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=",
"owner": "nodejs",
"repo": "node",
"tag": "v22.20.0"
"tag": "v22.21.1"
},
"fetcher": "fetchFromGitHub"
},
@@ -4000,7 +4000,7 @@
},
"electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f",
"modules": "140",
"node": "22.20.0",
"version": "39.0.0"
"node": "22.21.1",
"version": "39.1.1"
}
}
+3 -3
View File
@@ -10,7 +10,7 @@
buildGoModule (finalAttrs: {
pname = "kustomize";
version = "5.7.1";
version = "5.8.0";
ldflags =
let
@@ -26,13 +26,13 @@ buildGoModule (finalAttrs: {
owner = "kubernetes-sigs";
repo = "kustomize";
rev = "kustomize/v${finalAttrs.version}";
hash = "sha256-eLj9OQlHZph/rI3om6S5/0sYxjgYloUWag2mS0hEpCE=";
hash = "sha256-BOM0m/bigELUf6xHjLbI8wzSscF0lhwCjIxa87xBbWM=";
};
# avoid finding test and development commands
modRoot = "kustomize";
proxyVendor = true;
vendorHash = "sha256-OodR5WXEEn4ZlVRTsH2uSmuJuP+6PYRLvTEZCenx4XU=";
vendorHash = "sha256-kwvfxHXL189PSK7+PnOr+1TSjuX3uHkV4VnG3gSW5v0=";
nativeBuildInputs = [ installShellFiles ];
+1 -3
View File
@@ -392,6 +392,7 @@ with pkgs;
ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; };
ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };
ollama-vulkan = callPackage ../by-name/ol/ollama/package.nix { acceleration = "vulkan"; };
device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { };
@@ -1759,9 +1760,6 @@ with pkgs;
hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";
};
buildah = callPackage ../development/tools/buildah/wrapper.nix { };
buildah-unwrapped = callPackage ../development/tools/buildah { };
cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (
haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix
);