Merge master into staging-next
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
doxygen,
|
||||
dynarmic,
|
||||
enet,
|
||||
fetchzip,
|
||||
fetchFromGitHub,
|
||||
fmt,
|
||||
ffmpeg_6-headless,
|
||||
glslang,
|
||||
@@ -19,6 +19,7 @@
|
||||
libusb1,
|
||||
moltenvk,
|
||||
nlohmann_json,
|
||||
oaknut,
|
||||
openal,
|
||||
openssl,
|
||||
pipewire,
|
||||
@@ -30,6 +31,7 @@
|
||||
soundtouch,
|
||||
stdenv,
|
||||
vulkan-headers,
|
||||
vulkan-memory-allocator,
|
||||
xbyak,
|
||||
libxext,
|
||||
libx11,
|
||||
@@ -47,6 +49,7 @@
|
||||
enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,
|
||||
nix-update-script,
|
||||
darwinMinVersionHook,
|
||||
fetchpatch,
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
@@ -58,11 +61,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "azahar";
|
||||
version = "2124.3";
|
||||
version = "2125.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-JpqEJIKdmSJ5D9Q+a6YbHMJNTCK3+vDaSCSI23i60pk=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "azahar-emu";
|
||||
repo = "azahar";
|
||||
tag = finalAttrs.version;
|
||||
postCheckout = ''
|
||||
git -C "$out/externals" submodule update --init \
|
||||
teakra zstd discord-rpc spirv-headers spirv-tools sirit xxHash \
|
||||
faad2/faad2 lodepng/lodepng dds-ktx nihstro "$out/dist/compatibility_list"
|
||||
echo "${finalAttrs.version}" > "$out/GIT-TAG"
|
||||
git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT"
|
||||
'';
|
||||
hash = "sha256-KzM2FWJPxZtkpwvK4DSdfNuxE8yy1OVaioVegQbBSWk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -100,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
soundtouch
|
||||
SDL2
|
||||
vulkan-headers
|
||||
xbyak
|
||||
vulkan-memory-allocator
|
||||
|
||||
# https://github.com/azahar-emu/azahar/issues/1283
|
||||
# spirv-tools
|
||||
@@ -109,6 +121,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Azahar uses zstd_seekable which is not currently packaged in nixpkgs
|
||||
# zstd
|
||||
]
|
||||
++ optionals stdenv.hostPlatform.isx86_64 [ xbyak ]
|
||||
++ optionals stdenv.hostPlatform.isAarch64 [ oaknut ]
|
||||
++ optionals enableQtTranslations [ qt6.qttools ]
|
||||
++ optionals enableCubeb [ cubeb ]
|
||||
++ optionals useDiscordRichPresence [ rapidjson ]
|
||||
@@ -124,6 +138,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(darwinMinVersionHook "13.4")
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "cmake-Add-option-to-use-system-oaknut.patch";
|
||||
url = "https://github.com/azahar-emu/azahar/commit/6201256e15ee4d4fc053933545abf50fc46be178.patch";
|
||||
hash = "sha256-03eIubAJ65W9clI9iaLcLNAAMbkX4E507nYNV8DVwZc=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# We already know the submodules are present
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
diff --git a/src/toolchains.rs b/src/toolchains.rs
|
||||
index 53a7ddb..795a711 100644
|
||||
index a4be8cdcfe..b3e4dc3cee 100644
|
||||
--- a/src/toolchains.rs
|
||||
+++ b/src/toolchains.rs
|
||||
@@ -206,6 +206,8 @@ impl Toolchain {
|
||||
@@ -208,7 +208,9 @@
|
||||
})?;
|
||||
}
|
||||
|
||||
+ nix_patchelf(tmpdir.path().to_path_buf())
|
||||
+ .expect("failed to patch toolchain for NixOS");
|
||||
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
|
||||
- fs::rename(tmpdir.keep(), dest).map_err(InstallError::Move)
|
||||
+ let tmpdir = tmpdir.keep();
|
||||
+ nix_patchelf(tmpdir.clone()).expect("failed to patch toolchain for NixOS");
|
||||
+ fs::rename(tmpdir, dest).map_err(InstallError::Move)
|
||||
}
|
||||
|
||||
@@ -533,3 +535,42 @@ fn download_tarball(
|
||||
pub(crate) fn remove(&self, dl_params: &DownloadParams) -> io::Result<()> {
|
||||
@@ -564,3 +566,46 @@
|
||||
res => res,
|
||||
}
|
||||
}
|
||||
@@ -25,8 +27,10 @@ index 53a7ddb..795a711 100644
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap());
|
||||
+ eprintln!(
|
||||
+ "info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap()
|
||||
+ );
|
||||
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
||||
+ .arg("--set-interpreter")
|
||||
+ .arg("@dynamicLinker@")
|
||||
@@ -43,8 +47,10 @@ index 53a7ddb..795a711 100644
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap());
|
||||
+ eprintln!(
|
||||
+ "info: you seem to be running NixOS. Attempting to patch {}",
|
||||
+ entry.path().to_str().unwrap()
|
||||
+ );
|
||||
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
||||
+ .arg("--set-rpath")
|
||||
+ .arg("@libPath@")
|
||||
|
||||
@@ -8,17 +8,18 @@
|
||||
runCommand,
|
||||
patchelf,
|
||||
zlib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-bisect-rustc";
|
||||
version = "0.6.8";
|
||||
version = "0.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "cargo-bisect-rustc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7HiM1oRuLSfRaum66duag/w8ncFdxRLF0yeSGlIey0Y=";
|
||||
hash = "sha256-uyIdQn9EQnjBAHBPqvphaKg2KRufveOXOiHEKk0fTGQ=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@@ -44,12 +45,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM=";
|
||||
cargoHash = "sha256-WSO5LvdJkAorSwsICz9NAWKNM7x4aeNvhGLhJSO6Vi8=";
|
||||
|
||||
checkFlags = [
|
||||
"--skip=test_github" # requires internet
|
||||
"--skip=cli_tests" # trycmd does not seem to work in nix's sandbox
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Bisects rustc, either nightlies or CI artifacts";
|
||||
mainProgram = "cargo-bisect-rustc";
|
||||
@@ -58,6 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sandarukasa ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "deck";
|
||||
version = "1.56.0";
|
||||
version = "1.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F57BuEU91wRLVaA4YYHyqCKdBL60ZiHEAyuuioLN66c=";
|
||||
hash = "sha256-0j3/cFRKclyO4mpm+r5lBqM3uTnzUatfLqH2aUMDbUA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-joVAsg714Nuizv1fYYMes7vGsWbIvmUPKRDuU/Hwyso=";
|
||||
vendorHash = "sha256-/Cde+eGOqUsL3Q5jDtZaTzOTMnE72ncgBMQzcIeNVls=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "delta";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = "delta";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JkJfyVgaiXBKgin9Lf+zB7znDd9BkX4GBX54Gt1LM7M=";
|
||||
hash = "sha256-vW2mPAxlPXdwqyK/QhU/DOx6MD9u6DDVCDm0OEWm4AQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CLHJfwaNsOsCONadlLUjTwx1Sr+2ftKsJh8XrCoJ24I=";
|
||||
cargoHash = "sha256-CC2ncgujdcn1CJxU16beCjfQ1HR2+f6D8qYbZULEm7g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -105,5 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin
|
||||
mainProgram = "domoticz";
|
||||
knownVulnerabilities = [
|
||||
"CVE-2026-1001"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDprintPlugin }:
|
||||
mkDprintPlugin {
|
||||
description = "Biome (JS/TS/JSON) wrapper plugin";
|
||||
hash = "sha256-UXpqyifwSnkenmhO8tLmc0+KPtz8yZd/tST/LUEZkwo=";
|
||||
hash = "sha256-dcM4Z9QP0B+gp2MnQxTfjIykPYZdwPuKnQRjjpL5DV8=";
|
||||
initConfig = {
|
||||
configExcludes = [ "**/node_modules" ];
|
||||
configKey = "biome";
|
||||
@@ -17,6 +17,6 @@ mkDprintPlugin {
|
||||
};
|
||||
pname = "dprint-plugin-biome";
|
||||
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.4.wasm";
|
||||
version = "0.12.4";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.5.wasm";
|
||||
version = "0.12.5";
|
||||
}
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zgbbbuq+sb+nU1vgzaxEHGY77k+TXFrlvcvs/NSqQAM=";
|
||||
hash = "sha256-77WMsnC2WgVnbw1BsCj9ayS6XPsVTghmtIyl9Dk71uY=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/internal/web/ui";
|
||||
hash = "sha256-GT0yisPn+3FCtWL3he0i5zPMlaWNparQDefU69G4Yis=";
|
||||
hash = "sha256-MiHFeyDxLzYF3t9H8OEn/bL10WRbzMcwlENs2FSJ4xo=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -54,7 +54,7 @@ buildGoModule (finalAttrs: {
|
||||
modRoot = "collector";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-A1mbMmpUxg5T7//X5PL1CPGB1OMPhertFvz4sPFTgOg=";
|
||||
vendorHash = "sha256-i/BV987/ZYnCRYX8m9iFdtPo0vrWsmpn6UDs0q59sMM=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
directoryListingUpdater,
|
||||
gawk,
|
||||
groff,
|
||||
man,
|
||||
pcre2,
|
||||
nixosTests,
|
||||
@@ -27,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-0Y8hpgKwl3ilqQlr8b6EQbdzPpmBUEdKzPcD0WX06/Q=";
|
||||
};
|
||||
|
||||
# See https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/tree/man/man7/man.7,
|
||||
# https://github.com/NixOS/nixpkgs/issues/498875
|
||||
postPatch = ''
|
||||
substituteInPlace man/man7/man.7 \
|
||||
--replace-fail '.so man7/groff_man.7' '.so ${lib.getMan groff}/share/man/man7/groff_man.7'
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
gawk
|
||||
man
|
||||
|
||||
@@ -45,13 +45,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prl-tools";
|
||||
version = "26.2.2-57373";
|
||||
version = "26.3.0-57392";
|
||||
|
||||
# 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-QsMMPzF7RRw2etxHLiOHc8ofSrO+rk/3T1Y3+zAnwnM=";
|
||||
hash = "sha256-pVTlGXZVb/Q/6/i7B07KWb3Kg+5Lm06+v4ERxUjoW7o=";
|
||||
};
|
||||
|
||||
hardeningDisable = [
|
||||
|
||||
@@ -7,16 +7,18 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "pyprland";
|
||||
version = "3.1.0";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qayntjpE3WYBl6idfpwtvkEo61oHtc80uNEm0m4XA2o=";
|
||||
hash = "sha256-h7eoNn8ygdtg5rp9S2PSgCa9HSTgDZOjFvGl6KRbAtY=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "reqable";
|
||||
version = "3.0.39";
|
||||
version = "3.0.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
|
||||
hash = "sha256-xKoIS2m1SGMRSbLKP3Yf81nYVcsB9sn3RhKHJvH+nHE=";
|
||||
hash = "sha256-ddbFkkJjgQyZJEe7sL5cBbpmamSzg7mVg/zr3kXGLzI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -55,13 +55,13 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
version = "8.4.0";
|
||||
version = "8.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QUBeScKGlDQAZ4F08DD/DuxeT0Hut3MmuswsjGsy+Q0=";
|
||||
hash = "sha256-HjIU7L3iSr51w3KxzmaVzOI6qtAyyyWTlK1HygNyEzw=";
|
||||
};
|
||||
|
||||
sticker-creator = stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1774459818;
|
||||
SOURCE_DATE_EPOCH = 1774560637;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Disable code signing during local macOS builds.
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sillytavern";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SillyTavern";
|
||||
repo = "SillyTavern";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v2OAyaKBczo7BdTyA3WUlcIko484YgcgvYmwUk60AeI=";
|
||||
hash = "sha256-M4YvPsiCimbxHZoPO4+aIdwmYa4o5By+qnSl7FeAD5k=";
|
||||
};
|
||||
npmDepsHash = "sha256-fzKZnJbVXaPFn4l7VGiYBqJUT299fiVuKqfTZd2p53c=";
|
||||
npmDepsHash = "sha256-BE8B7yALOi5WLWHAvSPC2lUCgAFjUCOUMc4Ru2RBdJM=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "syft";
|
||||
version = "1.42.2";
|
||||
version = "1.42.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "syft";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ewy5I/dEH5rt6RgCJsLNx/yemcPdzqbhAKyOvUzs7Uk=";
|
||||
hash = "sha256-EPno5G2Wfgrcu9DdObn1NNwIkf2r6VgD/S2h/BUjIzU=";
|
||||
# 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;
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-uT5dLpYeQDakfVr5r7FjbwBIwDtRfPkoBtvyrpA7GUo=";
|
||||
vendorHash = "sha256-Iy5syp/Mbuuz422Ylzl6lN/Q60PwrYW1jMfNahEH3Xg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
x86_64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.1/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-Qg00JIeYpGPcgd9jlbyfOrklWVrseMMLwv5hw87RP/0=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/linux/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-hSK1tCCIgMebYIi9e7XCkASHYsZ3GvniMubJxUdHyT8=";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.1/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-GBoNTdSod/IOfsCzYCqU9DLzj2LEjXUwig6gjMbCrYs=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/linux/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-IxcW/tBU0YR8FRAKU4Tzq19/dGuYn5QMqNjG27ABo0I=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.1/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-MtCtWY3/dIIzL3f4IyZzHQPXNuR+OQFR318jQNO5r78=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/darwin/amd64/sysdig-cli-scanner";
|
||||
hash = "sha256-lS6O5c7MYmRepea6MdrVa8+EzrjcMjBCnmHdem6f2AE=";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.1/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-vjbpPx8swNwuhperEnDP9sQe+Q1vJU4ZfvLloE2gbh4=";
|
||||
url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.25.2/darwin/arm64/sysdig-cli-scanner";
|
||||
hash = "sha256-H1HWvGL++3/SqSjmSbqU+tHx8Zxh47NAdFRWw/qJqVY=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "Tautulli";
|
||||
version = "2.16.1";
|
||||
version = "2.17.0";
|
||||
pyproject = false;
|
||||
|
||||
pythonPath = [ python3Packages.setuptools ];
|
||||
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "Tautulli";
|
||||
repo = "Tautulli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Zct7EhnU5LROO23Joz6OxQTtC9uGZhtceSG+aX6MI2c=";
|
||||
sha256 = "sha256-1NslfaQLQvYM0WeAxzAmZVHTgVbFB2XK/8T+EoCMK1k=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -10,7 +10,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trivy";
|
||||
version = "0.69.3";
|
||||
# As of March 2026, trivy has made compromised releases twice.
|
||||
# At a minimum, before updating, check the diff of this package, and of all
|
||||
# dependencies/GitHub Actions changes, carefully.
|
||||
# Also read about how the previous compromises occurred, and ensure
|
||||
# that the signs present then are not present now.
|
||||
# Finally, weigh the risk of a compromised release against the expected
|
||||
# benefit of the update, and consider the possibility of not updating.
|
||||
version = "0.69.3"; # Did you read the comment?
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zsv";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidaty";
|
||||
repo = "zsv";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Gc9RDrQmayTnCoFHYN8B3gdqR3CPyyLWtO31WpnJ3o=";
|
||||
hash = "sha256-ht6sg93bHrNTw1tEEkd9vRl5aIsc1q7nASakvECdyzI=";
|
||||
};
|
||||
|
||||
buildInputs = [ jq ];
|
||||
|
||||
@@ -26,7 +26,7 @@ let
|
||||
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
|
||||
"22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
|
||||
"22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
|
||||
"23.0.0-git".gitRelease = {
|
||||
rev = "c911b8492374942bf4cfe35411e90a35d3837f6a";
|
||||
rev-version = "23.0.0-unstable-2026-03-22";
|
||||
|
||||
@@ -39,6 +39,10 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"ijson"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
azure-core
|
||||
azure-identity
|
||||
|
||||
@@ -25,17 +25,17 @@
|
||||
let
|
||||
src = buildNpmPackage (finalAttrs: {
|
||||
pname = "fava-frontend";
|
||||
version = "1.30.11";
|
||||
version = "1.30.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beancount";
|
||||
repo = "fava";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/e3HNAlezqUTt0RYxjrdktM/mwBpZ4CqRuYbLTzww0w=";
|
||||
hash = "sha256-krRkcahikP0ChTCXeS/3MBq4v+VmBLViqaYSSGYt6Mc=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||
|
||||
npmDepsHash = "sha256-K0XDMTqqSq0wbCqs8HXXP0XgADJQaiYD2AN5ilAXfRM=";
|
||||
npmDepsHash = "sha256-kZAwvyjPZUFJffYsr5917zX+0tMyydcOzfr/TDnoJKw=";
|
||||
makeCacheWritable = true;
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
google-api-core,
|
||||
google-cloud-access-context-manager,
|
||||
google-cloud-org-policy,
|
||||
@@ -11,6 +10,7 @@
|
||||
grpc-google-iam-v1,
|
||||
libcst,
|
||||
mock,
|
||||
nix-update-script,
|
||||
proto-plus,
|
||||
protobuf,
|
||||
pytest-asyncio,
|
||||
@@ -18,19 +18,19 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.31.3";
|
||||
version = "4.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-cloud-python";
|
||||
tag = "google-cloud-build-v${version}";
|
||||
sha256 = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U=";
|
||||
tag = "google-cloud-asset-v${finalAttrs.version}";
|
||||
sha256 = "sha256-dVgcnnInqjUjySL7wjxGzI33t1YZJ8e9mSsmjAJ+fBI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/google-cloud-asset";
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-asset";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -66,23 +66,25 @@ buildPythonPackage rec {
|
||||
"google.cloud.asset_v1"
|
||||
"google.cloud.asset_v1p1beta1"
|
||||
"google.cloud.asset_v1p2beta1"
|
||||
"google.cloud.asset_v1p4beta1"
|
||||
"google.cloud.asset_v1p5beta1"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
# python updater script sets the wrong tag
|
||||
skipBulkUpdate = true;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "google-cloud-asset-v";
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regexp"
|
||||
"^google-cloud-asset: v([0-9.]+)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Python Client for Google Cloud Asset API";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-${src.tag}/packages/google-cloud-asset/CHANGELOG.md";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-${finalAttrs.src.tag}/packages/google-cloud-asset/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.sarahec ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "idasen-ha";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abmantis";
|
||||
repo = "idasen-ha";
|
||||
tag = version;
|
||||
hash = "sha256-CBm9vCsfiVYj7tFTXWC+I3QYUdQ9EsjDJ6ed/BDf4S4=";
|
||||
hash = "sha256-Ksckc4aayv33Xd4tmfzCUq8e5kWPnxw7xAlPKOIlmow=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ijson";
|
||||
version = "3.4.0.post0";
|
||||
version = "3.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mqAtxwuyRWcKbKf7pze5kq7rSJU2CYBiL35Wjb8j5B4=";
|
||||
hash = "sha256-lGiHYHIOP1IScxs8uNMCZ/mgRfs4+zhwJU57lQQkbzE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyanglianwater";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantherale0";
|
||||
repo = "pyanglianwater";
|
||||
tag = version;
|
||||
hash = "sha256-iMUrX6tyPVf/L/kUymmrqUO4JOaQUhWdrkRPiOBIVGg=";
|
||||
hash = "sha256-Qe1LrM6pwuaWBQYRc7t1xJ38rIT1VlexkRcOGPX/BlA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-pooldose";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lmaertin";
|
||||
repo = "python-pooldose";
|
||||
tag = version;
|
||||
hash = "sha256-MbfFCE88xWGGRkRPqZ9oftaydxs5R2cgIcdU0YqWQi4=";
|
||||
hash = "sha256-7oG0qm0GMiFVgs6tQo9o2jaCZ/rou96QPRpLU853AQs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sfrbox-api";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacf-fr";
|
||||
repo = "sfrbox-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B29wpOr8yClAuA0KfWTCs4nRLOm2gMU8ayyr5VbF+qQ=";
|
||||
hash = "sha256-hK4d9wy2+wUp8elEHW0suu9frYPNnwFUlIRvjTXfRkc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "streamlit-folium";
|
||||
version = "0.26.2";
|
||||
version = "0.27.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randyzwitch";
|
||||
repo = "streamlit-folium";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6BCJ1j6p46EA696Ll9p3JOwGywp5gdhFA6k6HhVAZYo=";
|
||||
hash = "sha256-8FpU0dCuHlGvr2k8LAJs2tR3yRSIOHc+Q5V13oSNgEI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttn-client";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angelnu";
|
||||
repo = "thethingsnetwork_python_client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PEkxEKet0nrowWJ4J3AqqqdecO4zSbTampz/Dx0QD2s=";
|
||||
hash = "sha256-n5AvHE9oe7+vqxUsqqGeVcENU8+I0y0jikbulAHAR3Q=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -241,14 +241,14 @@ lib.makeExtensible (
|
||||
|
||||
nixComponents_git =
|
||||
(nixDependencies.callPackage ./modular/packages.nix rec {
|
||||
version = "2.35pre20260305_${lib.substring 0 8 src.rev}";
|
||||
version = "2.35pre20260328_${lib.substring 0 8 src.rev}";
|
||||
inherit teams;
|
||||
otherSplices = generateSplicesForNixComponents "nixComponents_git";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "124b277764bba830a35fea1dff7ced6db4b3f290";
|
||||
hash = "sha256-qTdRLFF1TgUj+EM34XO4nLyunSxKzbaSvKeuLdOmv2w=";
|
||||
rev = "7edcd0a24dc71abb7caa600527833ef540c1bc86";
|
||||
hash = "sha256-fybp46IQmRN7lEUTChc3MTqxmRutmDO4RNSPEQfJQsQ=";
|
||||
};
|
||||
}).appendPatches
|
||||
patches_common;
|
||||
|
||||
@@ -244,7 +244,7 @@ in
|
||||
|
||||
mapAliases {
|
||||
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
|
||||
llvmPackages_latest = llvmPackages_21;
|
||||
llvmPackages_latest = llvmPackages_22;
|
||||
llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
|
||||
# these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
|
||||
clang18Stdenv = lib.lowPrio llvmPackages_18.stdenv;
|
||||
|
||||
Reference in New Issue
Block a user