Merge master into staging-next
This commit is contained in:
@@ -68,9 +68,6 @@ pkgs.stdenvNoCC.mkDerivation {
|
||||
'';
|
||||
shellHook =
|
||||
let
|
||||
# trying to only add spaces as necessary for optional args
|
||||
# with optStr don't need spaces between nix templating
|
||||
optStr = cond: string: lib.optionalString cond "${string} ";
|
||||
args = [
|
||||
"hydra-check"
|
||||
]
|
||||
|
||||
@@ -17,12 +17,9 @@ in
|
||||
let
|
||||
inherit (builtins)
|
||||
attrNames
|
||||
concatStrings
|
||||
filter
|
||||
genList
|
||||
isNull
|
||||
length
|
||||
stringLength
|
||||
toJSON
|
||||
;
|
||||
inherit (pkgs.lib)
|
||||
|
||||
@@ -82,7 +82,7 @@ let
|
||||
version
|
||||
;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 2;
|
||||
fetcherVersion = 3;
|
||||
hash = pnpmHash;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "act";
|
||||
version = "0.2.87";
|
||||
version = "0.2.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = "act";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-i3DaVLspm/lP6HvRD56qToi3Vj9MijK0IfZA4n2Y5IA=";
|
||||
hash = "sha256-/nkaJlB2opuScXb8+Jo9rXdYN1Pwc+nq+T05Y4yxcCI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MsrWfrXuIi1m0vhDR05qbD4ynNpKvKwjUgDKbaq5iLs=";
|
||||
vendorHash = "sha256-z7FX2hrF4DkmHu0K9Atc76pa+PPLylimpoWhQCeF5uA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -125,9 +125,9 @@
|
||||
|
||||
azure-devops = mkAzExtension rec {
|
||||
pname = "azure-devops";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-4rDeAqOnRRKMP26MJxG4u9vBuos6/SQIoVgfNbBpulk=";
|
||||
hash = "sha256-CbBskqfEktpW+ziRkdZO0kCW70FJ+vaBQjEn66nOCXM=";
|
||||
description = "Tools for managing Azure DevOps";
|
||||
propagatedBuildInputs = with python3Packages; [ distro ];
|
||||
meta.maintainers = with lib.maintainers; [ katexochen ];
|
||||
@@ -174,9 +174,9 @@
|
||||
|
||||
confcom = mkAzExtension rec {
|
||||
pname = "confcom";
|
||||
version = "2.0.0b1";
|
||||
version = "2.0.0b2";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
|
||||
hash = "sha256-64Agk0G0nKPcM/KQYWoOudmKxelaaLouhet2IJB8QuM=";
|
||||
hash = "sha256-1j1ASDf/g4eSixhvxBFCS4yPiX8QG/+x7IC07g5aLfw=";
|
||||
description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-spellcheck";
|
||||
version = "0.15.5";
|
||||
version = "0.15.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drahnr";
|
||||
repo = "cargo-spellcheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0=";
|
||||
hash = "sha256-tKf1PiQ1ojAbW+RKut+QczPy0wIfQcsthV4lRwvmjUw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0=";
|
||||
cargoHash = "sha256-0TsDcdO7qCVcj6eNVu/lcehwsO2IhpNzW1C9zLbXXJs=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deck";
|
||||
version = "1.58.0";
|
||||
version = "1.59.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dNqG7R8iaV/XdefGAsx1trptWK8G6NIjj7dmSMG5tUI=";
|
||||
hash = "sha256-nBLY3X1r4ntqzosnwc2fVo/mWb7+5RHbKL1hUGmjRp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-b/eBY5VQJJGLxVDyCJclwbOpF0pgVCu+DKE/FoOyy4Q=";
|
||||
vendorHash = "sha256-AaZxe7VYor+XIW3gH+0YfPK7weauEh/ZHUK6KK2GhbA=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
Generated
+301
-643
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "eslint";
|
||||
version = "10.2.0";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eslint";
|
||||
repo = "eslint";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JsfiBU+BiqiBAIc4DwxXYl/wtBoM9bQntiem1+vi+/s=";
|
||||
hash = "sha256-XUVCFubLnht+OZIZRg2NzuX1/zDhqWYtQZzw8FwkTu4=";
|
||||
};
|
||||
|
||||
# NOTE: Generating lock-file
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage rec {
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-qpxHGNBRWN3hys5R+zJR870xIoN5VL6U3dUnKrIH0go=";
|
||||
npmDepsHash = "sha256-SET3In91HxRdSEVAgZHETF+ahOJg/4+Jb1Jy5msVzZs=";
|
||||
npmInstallFlags = [ "--omit=dev" ];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "arrowcloud-theme";
|
||||
version = "20260328";
|
||||
version = "20260424";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arrow-Cloud";
|
||||
repo = "theme";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9BND3IUIc5uMBxzw+Pn/59jBKBK/xGWrOIgcIYIQvgk=";
|
||||
hash = "sha256-Sdl32MARZnPYKN21xoWu8sa6E/lUloMiRrjpWfkXefc=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "digital-dance";
|
||||
version = "1.1.3-unstable-2026-04-19";
|
||||
version = "1.1.3-unstable-2026-04-29";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "JNero";
|
||||
repo = "Digital-Dance-ITGMania";
|
||||
rev = "bfce7a6d719189a3eec1577b54256941e8d602a5";
|
||||
hash = "sha256-yrXdU73Jokm+nMMi8mtxdEL5+xuFj4sHIW+/nulcJJI=";
|
||||
rev = "a26bc9f19be8b899ed5af35c01cdd21fe48ec94f";
|
||||
hash = "sha256-4A87hM+yG6mKfYdC2fZ5lhSDVVH4FPtXStkjC95CcLs=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "itg3encore";
|
||||
version = "0-unstable-2026-04-22";
|
||||
version = "0-unstable-2026-04-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarkBahamut162";
|
||||
repo = "itg3encore";
|
||||
rev = "b93cc8e88cb2a22ccc910bc42074975bbf800940";
|
||||
hash = "sha256-SgiqQPlEqw4wqqMA7jb2p63/hcEiEGS3a5LffgJHdgw=";
|
||||
rev = "87ef7392f84acf3c05c03749714a8f9cd893a34e";
|
||||
hash = "sha256-4wHDin/Nphd/BLP4HYsRQDZDWYhMRddv1D44q6Yvhto=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
nodejs_20,
|
||||
nodejs_22,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
xcbuild,
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
|
||||
hash = "sha256-Nrh4BNlhJyzj9cXQ6Yr7349r5H+4r9W3aldcg9+J6dU=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_20; # does not build with 22
|
||||
nodejs = nodejs_22;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace webpack.common.js \
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mona-sans";
|
||||
version = "2.0.8";
|
||||
version = "2.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = finalAttrs.version;
|
||||
owner = "github";
|
||||
repo = "mona-sans";
|
||||
sha256 = "sha256-L1KlduItf1jBrw08NwbJvZFemLY8JHRXq2UDl9Wlq70=";
|
||||
sha256 = "sha256-VBbn59v1EqP2cEDqna5vSz/uSgFHmF97bsAHyOBbRt0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
@@ -67,16 +67,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.69.0";
|
||||
version = "0.70.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qNWzyL0J7mYQcWYQOIjmlh+KH2WBb6LkYhTNiR6tDpw=";
|
||||
hash = "sha256-tfScscRllUlV1V6D66rfT6JEsReDQfVGryVzNebm0vg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-od8m149sJyfdUC0bJ1riHbgXlcX5Yc9K28LCcfWh6DE=";
|
||||
vendorHash = "sha256-IRV1GxdUKgan0GwmBg9acpl7plW01CtEO2FrKrlDdeE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
runCommandNoCC,
|
||||
runCommand,
|
||||
opentxl,
|
||||
}:
|
||||
runCommandNoCC "opentxl-test"
|
||||
runCommand "opentxl-test"
|
||||
{
|
||||
nativeBuildInputs = [ opentxl ];
|
||||
src = lib.sources.sourceByRegex ./. [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "patch2pr";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluekeyes";
|
||||
repo = "patch2pr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Jv2tGdziPLKy5vNUgwnB8ern3IYS+D+N5LMrsGIqTMI=";
|
||||
hash = "sha256-VevSvxGjASwEib8Kx91dYIMI2QC+Zl/igSnHy2w/1y4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tM4Y/dPn5ZCP5NJl+nOPulY3hKWzI/l8c+Ku+dxtWwI=";
|
||||
vendorHash = "sha256-mv3otcLQiUfrnNcrSe29kA2xpcuRgMMnD9VQ/84DQeM=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prl-tools";
|
||||
version = "26.3.1-57396";
|
||||
version = "26.3.2-57398";
|
||||
|
||||
# We download the full distribution to extract prl-tools-lin.iso from
|
||||
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
|
||||
src = fetchurl {
|
||||
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-7AIH9SRXjFM1D7AX1wL4VZAJAMZ3OP/bIl8YitkSxQM=";
|
||||
hash = "sha256-JjbXQEtPKfCsgOpuffmGjmaypVT/JK3qx92HWUFJ7VI=";
|
||||
};
|
||||
|
||||
hardeningDisable = [
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "process-compose";
|
||||
version = "1.103.0";
|
||||
version = "1.110.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = "process-compose";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DLMMUMI/1ntsa5EydjOR+eTcscVsppX1jdRAhijTBLE=";
|
||||
hash = "sha256-kKb7CFjjvgmRTVgYKXM/EP/ti8OFhlFGcATqZcYHxOI=";
|
||||
|
||||
# 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.
|
||||
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-+1dFQYVHSux4WIjUifaUzkFVDzeelY18UA+0bPrXE+E=";
|
||||
vendorHash = "sha256-dNSf2CJQRJAZiIimriYqlqwcaD1NQg7a1qFPMzEsrgw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
mono,
|
||||
nodejs_20,
|
||||
nodejs_24,
|
||||
slskd,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_24;
|
||||
# https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62
|
||||
npmHooks = buildPackages.npmHooks.override { inherit nodejs; };
|
||||
in
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchYarnDeps,
|
||||
fixup-yarn-lock,
|
||||
callPackage,
|
||||
nodejs_20,
|
||||
nodejs_22,
|
||||
yarn,
|
||||
}:
|
||||
let
|
||||
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
fixup-yarn-lock
|
||||
nodejs_20
|
||||
(yarn.override { nodejs = nodejs_20; })
|
||||
nodejs_22
|
||||
(yarn.override { nodejs = nodejs_22; })
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
|
||||
buildTeleport {
|
||||
version = "17.7.20";
|
||||
hash = "sha256-zxP7vhDyxypotG58wzwlCx8JMoRSYC0adMe+zKfrOek=";
|
||||
vendorHash = "sha256-uwSCPu3z9LCvN/vKJg/Q9rgk6wnjh4P4tq4a5suPNrg=";
|
||||
cargoHash = "sha256-opLo7UmZzxrVxYZOwn4v4G5lhHFp5GrdOZe7uIb97q0=";
|
||||
pnpmHash = "sha256-quHu43JccCpguSeHkGnpqL81oDN4p5WtAt/sOgMCCec=";
|
||||
version = "17.7.23";
|
||||
hash = "sha256-o1aYmNN4yytgJFQ7V1sPjq6r2pDzf4mG/juyYK5IF3A=";
|
||||
vendorHash = "sha256-cL2U1GOV6PtxSl8N8gjKOHCpj5jhun5D+DbeWBixnxI=";
|
||||
cargoHash = "sha256-cDcDfptq8z0pwjImuAovv/5XwoaPb/ostyxkyNEbkRM=";
|
||||
pnpmHash = "sha256-NTH5YnqeZg/jEkjguSXGS3/MI/r8us11By/fZ1m1caQ=";
|
||||
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
|
||||
inherit buildGoModule withRdpClient extPatches;
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
|
||||
buildTeleport {
|
||||
version = "18.7.2";
|
||||
hash = "sha256-1ANYBYNhTzSA3zhgUgKks73piHdw+4iXGFmGUWHTYpE=";
|
||||
vendorHash = "sha256-0HxDrsWWRjuaVGtbX7xwCMsj2dYRJr3wmpf8qInlyBE=";
|
||||
pnpmHash = "sha256-XJ2SLCMoFFeoBQ3YKIlq4APNOhSS8ipTNQufQ1nkYqs=";
|
||||
cargoHash = "sha256-SfVoh4HnHSOz1haPPV7a/RyA6LFjLRe78Mn2fVdVyEA=";
|
||||
version = "18.7.6";
|
||||
hash = "sha256-p7qwsUr6n6OAl/b20SgropAubfPfwBiVTvbReb2HpO8=";
|
||||
vendorHash = "sha256-/ZY0J0yB/8qMG6vEIta7Nf2Uv3xTZ/WPoMz+Dj5hwZA=";
|
||||
pnpmHash = "sha256-uRsS5m0Q4fAFvJ3Qp6xcEAB8QFriLXbeGtD0o0n46RE=";
|
||||
cargoHash = "sha256-KkFwMSBXsRmDuaPU1n6FPq2P5UQiQnb7+HEDOhhmjd0=";
|
||||
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
|
||||
buildGoModule = buildGo125Module;
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tyrolienne";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.uku3lig.net";
|
||||
owner = "uku";
|
||||
repo = "tyrolienne";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jl1h7L+Ae28A7YFoIsQqxbx2XmxxjUHebD5Xba0cB5o=";
|
||||
hash = "sha256-JdXamx+pwUEJWSbPFvROrx/XJojZ5sC+MEH0QVpKD+Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J/gS8tyy+5ZG1xl4NrYCU26lD0yvsVyRUoOXntCgVSE=";
|
||||
cargoHash = "sha256-JM4Y0FyqVYqChpPh9p/QulfV8IesUJ0p/ooxAJLfo6I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
Reference in New Issue
Block a user