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

This commit is contained in:
K900 2025-07-11 15:12:33 +03:00
commit de7b147666
41 changed files with 368 additions and 221 deletions

View File

@ -8,13 +8,13 @@
}: }:
mkLibretroCore { mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw"; core = "mednafen-psx" + lib.optionalString withHw "-hw";
version = "0-unstable-2025-06-27"; version = "0-unstable-2025-07-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "beetle-psx-libretro"; repo = "beetle-psx-libretro";
rev = "27aa688076606a272d024fcad67b330fe434ff0d"; rev = "42dc44815131079db0de69d2b1d52e9f7edf842e";
hash = "sha256-omr5k1NOB3RZVeQJj2hbK53hiQbJwu7utEnxqfFPqbU="; hash = "sha256-gphkj9oVWg5NOfdxoRHAY5/ipAcRVhYMlKPW6AAxw4w=";
}; };
extraBuildInputs = lib.optionals withHw [ extraBuildInputs = lib.optionals withHw [

View File

@ -10,11 +10,11 @@
buildMozillaMach rec { buildMozillaMach rec {
pname = "firefox-beta"; pname = "firefox-beta";
binaryName = pname; binaryName = pname;
version = "141.0b5"; version = "141.0b8";
applicationName = "Firefox Beta"; applicationName = "Firefox Beta";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1b77e890ea06e0ea468fc65a3f19e9b3e5c9881aa64bf4276911a1fe7d1c1c887e3a59be4a54bce8f29b705a09c2ada723d189cbead107a80cfa4dd48fa7fab9"; sha512 = "6727f7543a6a00e557c282f9a94663bb789eba90ca261725f56277a3eff65bd26b28285618ca5949df1c9254d2f03bbc517b681d6a156b363476542af4c7f913";
}; };
meta = { meta = {

View File

@ -10,13 +10,13 @@
buildMozillaMach rec { buildMozillaMach rec {
pname = "firefox-devedition"; pname = "firefox-devedition";
binaryName = pname; binaryName = pname;
version = "141.0b5"; version = "141.0b8";
applicationName = "Firefox Developer Edition"; applicationName = "Firefox Developer Edition";
requireSigning = false; requireSigning = false;
branding = "browser/branding/aurora"; branding = "browser/branding/aurora";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "0bb3da49a048eec25a97de40a1446aab3e737c927d339f1da5025751758d40a518b5c934ff295d8294e98a4f67b7ca9a1e10b3813746048a02d244916220962c"; sha512 = "b64e483eb1ad1c3bf9b60d59b9fbd99f32eb1689f8b15cde0b08fde4e1fe68481e2f128ff450b1c4922029c328b493d2a2a21434ae7479a744ecb067fc376476";
}; };
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

View File

@ -17,7 +17,7 @@
buildGoModule rec { buildGoModule rec {
pname = "rclone"; pname = "rclone";
version = "1.70.2"; version = "1.70.3";
outputs = [ outputs = [
"out" "out"
@ -28,7 +28,7 @@ buildGoModule rec {
owner = "rclone"; owner = "rclone";
repo = "rclone"; repo = "rclone";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-XQGrXa2sXY+vjyQJnDAEGYp8n7/nGD2ZJFkTN0k4keg="; hash = "sha256-3MQyziA+Xq8oSOvex4WeeXs8rPDOcSkLHUH0Fcg8ENs=";
}; };
vendorHash = "sha256-/A9Sq7KlHitqHxvElVMQtuXUWhweiB0ukut7AJYaJHw="; vendorHash = "sha256-/A9Sq7KlHitqHxvElVMQtuXUWhweiB0ukut7AJYaJHw=";

View File

@ -0,0 +1,41 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "cloudgoat";
version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "RhinoSecurityLabs";
repo = "cloudgoat";
tag = "v${version}";
hash = "sha256-xDUDpdEluYKudrjIYOoQWNvF8BoC/VpSVdV5pzfLoMc=";
};
build-system = with python3.pkgs; [ poetry-core ];
dependencies = with python3.pkgs; [
argcomplete
boto3
pyyaml
requests
sqlite-utils
];
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
pythonImportsCheck = [ "cloudgoat" ];
meta = {
description = "AWS deployment tool for a vulnerable environment";
homepage = "https://github.com/RhinoSecurityLabs/cloudgoat";
changelog = "https://github.com/RhinoSecurityLabs/cloudgoat/releases/tag/${src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "cloudgoat";
};
}

View File

@ -9,19 +9,19 @@
}: }:
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex"; pname = "codex";
version = "0.2.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openai"; owner = "openai";
repo = "codex"; repo = "codex";
tag = "rust-v${finalAttrs.version}"; tag = "rust-v${finalAttrs.version}";
hash = "sha256-lpZsECLWmoGJYafL3FlmR6WwOcynGgqWq6IUB+/y6lY="; hash = "sha256-rRe0JFEO5ixxrZYDL8kxXDOH0n7lqabkXNNaSlNnQDg=";
}; };
sourceRoot = "${finalAttrs.src.name}/codex-rs"; sourceRoot = "${finalAttrs.src.name}/codex-rs";
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-DIDAk5ibwEQ9mwOUS2JNFEA2npVK9TBph/TuwiJgfL4="; cargoHash = "sha256-QIZ3V4NUo1VxJN3cwdQf3S0zwePnwdKKfch0jlIJacU=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ddcutil"; pname = "ddcutil";
version = "2.2.0"; version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz";
hash = "sha256-7Qx58cWCafSRuNyhcdSSuf7xM0JzcOG6UFiWa5K5VS4="; hash = "sha256-cch2DDg91fohgXg5uGuYUKxtVY4TPi1v6ojfrwREiuY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,16 +11,16 @@
buildGoModule rec { buildGoModule rec {
pname = "direnv"; pname = "direnv";
version = "2.36.0"; version = "2.37.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "direnv"; owner = "direnv";
repo = "direnv"; repo = "direnv";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xqHc4Eb0mHQezmElJv20AMNQPgusXdvskNmlO+JP1lw="; hash = "sha256-wMv2ZzAc3GhUhvSnHgxJKPFmEjhujff9/CozYcgKfbk=";
}; };
vendorHash = "sha256-+7HnbJ6cIzYHkEJVcp2IydHyuqD5PfdL6TUcq7Dpluk="; vendorHash = "sha256-SAIGFQGACTB3Q0KnIdiKKNYY6fVjf/09wGqNr0Hkg+M=";
# we have no bash at the moment for windows # we have no bash at the moment for windows
BASH_PATH = lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; BASH_PATH = lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash";

View File

@ -10,19 +10,19 @@
buildGoModule rec { buildGoModule rec {
pname = "godns"; pname = "godns";
version = "3.2.4"; version = "3.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimothyYe"; owner = "TimothyYe";
repo = "godns"; repo = "godns";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Uf+V6A5Q1gQQn+hJUUwmeaGve8364Lui2dMeCzkkeTQ="; hash = "sha256-pe+A4n2IaiCOoDFc8NVk1NogNBqJ9Z4EnMBhiMbpkMU=";
}; };
vendorHash = "sha256-PrXi460v7ooBhFooLw14tMDvLvEzIYt+4Y+36BYdWzA="; vendorHash = "sha256-ascWufBz1cp74g8QXJjEdF23WLZCwvxY+QUKMmfzhSM=";
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
src = "${src}/web"; src = "${src}/web";
hash = "sha256-+a5IrJLamuNmwGhPIA7JKvgm6COnYre6bPuAv1PgGns="; hash = "sha256-DqNgy/ZrSQPSCqZriKosSUybHq3PbuPOjIFqRW+Nu14=";
}; };
npmRoot = "web"; npmRoot = "web";

View File

@ -23,13 +23,13 @@ dependencies = [
[[package]] [[package]]
name = "analyzeme" name = "analyzeme"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"decodeme 10.1.3", "decodeme 10.1.3",
"decodeme 12.0.1", "decodeme 12.0.3",
"flate2", "flate2",
"measureme 10.1.3", "measureme 10.1.3",
"measureme 12.0.1", "measureme 12.0.3",
"memchr", "memchr",
"rustc-hash", "rustc-hash",
"serde", "serde",
@ -117,9 +117,9 @@ checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.40" version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -127,9 +127,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.40" version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -139,9 +139,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "4.5.40" version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@ -172,11 +172,11 @@ dependencies = [
[[package]] [[package]]
name = "crox" name = "crox"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"analyzeme", "analyzeme",
"clap", "clap",
"measureme 12.0.1", "measureme 12.0.3",
"rustc-hash", "rustc-hash",
"serde", "serde",
"serde_json", "serde_json",
@ -218,9 +218,9 @@ dependencies = [
[[package]] [[package]]
name = "decodeme" name = "decodeme"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"measureme 12.0.1", "measureme 12.0.3",
"memchr", "memchr",
"rustc-hash", "rustc-hash",
"serde", "serde",
@ -256,12 +256,12 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
[[package]] [[package]]
name = "flamegraph" name = "flamegraph"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"analyzeme", "analyzeme",
"clap", "clap",
"inferno", "inferno",
"measureme 12.0.1", "measureme 12.0.3",
] ]
[[package]] [[package]]
@ -363,9 +363,9 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]] [[package]]
name = "libredox" name = "libredox"
version = "0.1.3" version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"libc", "libc",
@ -403,7 +403,7 @@ dependencies = [
[[package]] [[package]]
name = "measureme" name = "measureme"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"log", "log",
"memmap2", "memmap2",
@ -439,20 +439,20 @@ dependencies = [
[[package]] [[package]]
name = "mmedit" name = "mmedit"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"clap", "clap",
"decodeme 12.0.1", "decodeme 12.0.3",
"measureme 12.0.1", "measureme 12.0.3",
] ]
[[package]] [[package]]
name = "mmview" name = "mmview"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"analyzeme", "analyzeme",
"clap", "clap",
"measureme 12.0.1", "measureme 12.0.3",
] ]
[[package]] [[package]]
@ -578,9 +578,9 @@ dependencies = [
[[package]] [[package]]
name = "rgb" name = "rgb"
version = "0.8.50" version = "0.8.51"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" checksum = "a457e416a0f90d246a4c3288bd7a25b2304ca727f253f95be383dd17af56be8f"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
] ]
@ -649,11 +649,11 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]] [[package]]
name = "stack_collapse" name = "stack_collapse"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"analyzeme", "analyzeme",
"clap", "clap",
"measureme 12.0.1", "measureme 12.0.3",
] ]
[[package]] [[package]]
@ -670,11 +670,11 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "summarize" name = "summarize"
version = "12.0.1" version = "12.0.3"
dependencies = [ dependencies = [
"analyzeme", "analyzeme",
"clap", "clap",
"measureme 12.0.1", "measureme 12.0.3",
"prettytable-rs", "prettytable-rs",
"rustc-hash", "rustc-hash",
"serde", "serde",

View File

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "measureme"; pname = "measureme";
version = "12.0.1"; version = "12.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "measureme"; repo = "measureme";
rev = version; rev = version;
hash = "sha256-G6GCXMyjwx1yYuCwSRj8j76zLKShtPFfQmTQnnqpMlk="; hash = "sha256-pejgWzHtpEBylFzG1+/8zTV7qR6gf6UuTmuH9GNPoD0=";
}; };
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;

View File

@ -8,13 +8,13 @@
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "nak"; pname = "nak";
version = "0.14.4"; version = "0.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fiatjaf"; owner = "fiatjaf";
repo = "nak"; repo = "nak";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-MoH1jQP4X3DYri5+TfmjBh3+5jkyItgcS7+nOBSnRGI="; hash = "sha256-0x9fMcB8voV9MFX+XxkXgrb2WdnQONPyLQgG1bJwu2Q=";
}; };
vendorHash = "sha256-5W7uqHT9iP5NbE3EFiFBSdjsINIWv5lIkz3K6yMcgrM="; vendorHash = "sha256-5W7uqHT9iP5NbE3EFiFBSdjsINIWv5lIkz3K6yMcgrM=";

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nuclei"; pname = "nuclei";
version = "3.4.6"; version = "3.4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "nuclei"; repo = "nuclei";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Z5GRnecr1+Uz+zL/QsYQQp78261ceE9i/Hp/ebwFKH8="; hash = "sha256-UlcMHbN41jY8T5aGlUvobzEUDopAzyI7pqs9SpzuPWU=";
}; };
vendorHash = "sha256-+DKiQAwZhxJZtPsGa6wuNu+jgtqrtgZtx3KSa0ROz/E="; vendorHash = "sha256-W/lnL2bcYIBFKt9vNiKLkas/QB3100DSdhW6yUN1MOY=";
proxyVendor = true; # hash mismatch between Linux and Darwin proxyVendor = true; # hash mismatch between Linux and Darwin

View File

@ -31,13 +31,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openvas-scanner"; pname = "openvas-scanner";
version = "23.20.2"; version = "23.21.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greenbone"; owner = "greenbone";
repo = "openvas-scanner"; repo = "openvas-scanner";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-n8ojCp2pGITsy7kY/8qZzKrVwD+4xxA1IEp+AEmU+FE="; hash = "sha256-OiW3+JAhqHsnxnyieiJcqbEYMZJ/7TGCpizKMQNcp4I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,23 +10,23 @@
let let
pname = "osu-lazer-bin"; pname = "osu-lazer-bin";
version = "2025.607.0"; version = "2025.710.0";
src = src =
{ {
aarch64-darwin = fetchzip { aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE="; hash = "sha256-Wg/HlnVjEV7rSTRTzYxP4w41PDVq+vPRT/+MArpK6+U=";
stripRoot = false; stripRoot = false;
}; };
x86_64-darwin = fetchzip { x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88="; hash = "sha256-aHlcjubkai5B9k49ptjR3RImkbqHpvyfgueMPZNDmmM=";
stripRoot = false; stripRoot = false;
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk="; hash = "sha256-Tfm75+jkSAqyNBkN3cVrx3hyw+Ai3lKa6ZIo47x2Rns=";
}; };
} }
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

View File

@ -1,30 +1,26 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p unzip curl jq common-updater-scripts #!nix-shell -I nixpkgs=./. --pure -i bash -p bash cacert curl jq nix unzip common-updater-scripts
set -eo pipefail set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
bin_file="$(realpath ./package.nix)" new_tag_name="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
new_version="${new_tag_name%-lazer}"
old_version="$(nix eval --raw -f . osu-lazer-bin.version)"
new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases/latest" | jq -r '.name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
if [[ "$new_version" == "$old_version" ]]; then if [[ "$new_version" == "$old_version" ]]; then
echo "Already up to date." echo "Already up to date."
exit 0 exit 0
fi fi
cd ../../../..
echo "Updating osu-lazer-bin from $old_version to $new_version..." echo "Updating osu-lazer-bin from $old_version to $new_version..."
sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file"
rm "$bin_file.bak"
for pair in \ for pair in \
'aarch64-darwin osu.app.Apple.Silicon.zip' \ 'aarch64-darwin osu.app.Apple.Silicon.zip' \
'x86_64-darwin osu.app.Intel.zip' \ 'x86_64-darwin osu.app.Intel.zip' \
'x86_64-linux osu.AppImage'; do 'x86_64-linux osu.AppImage'
do
set -- $pair set -- $pair
echo "Prefetching binary for $1..." echo "Prefetching binary for $1..."
prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_version/$2") prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_tag_name/$2")
if [[ "$1" == *"darwin"* ]]; then if [[ "$1" == *"darwin"* ]]; then
store_path=$(jq -r '.storePath' <<<"$prefetch_output") store_path=$(jq -r '.storePath' <<<"$prefetch_output")
tmpdir=$(mktemp -d) tmpdir=$(mktemp -d)
@ -35,6 +31,5 @@ for pair in \
hash=$(jq -r '.hash' <<<"$prefetch_output") hash=$(jq -r '.hash' <<<"$prefetch_output")
fi fi
echo "$1 ($2): hash = $hash" echo "$1 ($2): hash = $hash"
sed -Ei.bak '/ *'"$1"' = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' "$bin_file" update-source-version osu-lazer-bin "$new_version" "$hash" --system="$1" --ignore-same-version
rm "$bin_file.bak"
done done

View File

@ -434,11 +434,6 @@
"version": "6.0.0-rc.1.21451.13", "version": "6.0.0-rc.1.21451.13",
"hash": "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U=" "hash": "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="
}, },
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.0",
"hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
},
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.2", "version": "9.0.2",
@ -459,11 +454,6 @@
"version": "9.0.2", "version": "9.0.2",
"hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0=" "hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
}, },
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.0",
"hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
},
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "9.0.2", "version": "9.0.2",
@ -581,8 +571,8 @@
}, },
{ {
"pname": "NuGet.Versioning", "pname": "NuGet.Versioning",
"version": "6.12.1", "version": "6.14.0",
"hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=" "hash": "sha256-DqdOJgsphKxSvqB8b60zNPCaiLfbiu3WnUJ/90feLrY="
}, },
{ {
"pname": "NUnit", "pname": "NUnit",
@ -651,8 +641,8 @@
}, },
{ {
"pname": "ppy.osu.Framework", "pname": "ppy.osu.Framework",
"version": "2025.604.1", "version": "2025.710.0",
"hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM=" "hash": "sha256-p1AFltuRloCm/krTzGzhI5A89NT5yU2nK6ILwhgzLnc="
}, },
{ {
"pname": "ppy.osu.Framework.NativeLibs", "pname": "ppy.osu.Framework.NativeLibs",
@ -666,8 +656,8 @@
}, },
{ {
"pname": "ppy.osu.Game.Resources", "pname": "ppy.osu.Game.Resources",
"version": "2025.605.0", "version": "2025.708.0",
"hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ=" "hash": "sha256-lgGl/jLHMlguuPbQ7MW8uTUk+ZibmMiqtMZnE3xWEr4="
}, },
{ {
"pname": "ppy.osuTK.NS20", "pname": "ppy.osuTK.NS20",
@ -701,8 +691,8 @@
}, },
{ {
"pname": "ppy.Veldrid.SPIRV", "pname": "ppy.Veldrid.SPIRV",
"version": "1.0.15-gfbb03d21c2", "version": "1.0.15-gb66ebf81d2",
"hash": "sha256-rnl6+U4E3BJVYTWtEjOx7fDVcJJNBP8MOisoGVLT7vA=" "hash": "sha256-+0dUQTBEU0pPjRhZXvBkWTUpmMFfM9E6FWWT6yHS/9I="
}, },
{ {
"pname": "ppy.Vk", "pname": "ppy.Vk",
@ -1616,8 +1606,8 @@
}, },
{ {
"pname": "Velopack", "pname": "Velopack",
"version": "0.0.1053", "version": "0.0.1298",
"hash": "sha256-YAOvvHDyazxqxQoZ7rDB3szkYnTq/zrzS9mXnpI+2jI=" "hash": "sha256-oaejrsFMKymGY8/irvB1LEQdIe8NYtZbc+/RWUaL4hk="
}, },
{ {
"pname": "Vortice.D3DCompiler", "pname": "Vortice.D3DCompiler",

View File

@ -22,13 +22,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "osu-lazer"; pname = "osu-lazer";
version = "2025.607.0"; version = "2025.710.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ppy"; owner = "ppy";
repo = "osu"; repo = "osu";
tag = version; tag = "${version}-lazer";
hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI="; hash = "sha256-etIf0ZE1YHZntBQGciFlP1ARgWSTqytJIklAy77+q+Q=";
}; };
projectFile = "osu.Desktop/osu.Desktop.csproj"; projectFile = "osu.Desktop/osu.Desktop.csproj";
@ -95,7 +95,11 @@ buildDotnetModule rec {
}) })
]; ];
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex=(.*)-lazer"
];
};
meta = { meta = {
description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)";

View File

@ -0,0 +1,41 @@
{
lib,
fetchFromGitHub,
python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "pyprojectize";
version = "1a6";
pyproject = true;
src = fetchFromGitHub {
owner = "hroncok";
repo = "pyprojectize";
tag = version;
hash = "sha256-NW74IoGdghtX2Wlxocosx8zb3Htfqq6zN9iNpICdffs=";
};
build-system = with python3.pkgs; [
hatch-vcs
hatchling
];
dependencies = with python3.pkgs; [
packaging
specfile
];
nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
pythonImportsCheck = [ "pyprojectize" ];
meta = {
description = "Tool to convert a RPM spec file from %py3_build etc. macros to pyproject";
homepage = "https://github.com/hroncok/pyprojectize";
changelog = "https://github.com/hroncok/pyprojectize/releases/tag/${src.tag}";
license = lib.licenses.mit0;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "pyprojectize";
};
}

View File

@ -82,6 +82,8 @@ group :test do
gem 'bundle-audit', require: false gem 'bundle-audit', require: false
end end
gem "webrick"
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exist?(local_gemfile) if File.exist?(local_gemfile)
eval_gemfile local_gemfile eval_gemfile local_gemfile

View File

@ -1 +0,0 @@
gem 'webrick'

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index a933d0ab64..fced38bc32 100644 index 549e465ac..546c94607 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -160,6 +160,8 @@ advanced_option( @@ -175,6 +175,8 @@ advanced_option(
"Build using system unordered dense" "Build using system unordered dense"
OFF OFF
) )
@ -11,7 +11,7 @@ index a933d0ab64..fced38bc32 100644
option( option(
SLANG_SPIRV_HEADERS_INCLUDE_DIR SLANG_SPIRV_HEADERS_INCLUDE_DIR
@@ -386,6 +388,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE}) @@ -404,6 +406,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
find_package(unordered_dense CONFIG QUIET) find_package(unordered_dense CONFIG QUIET)
endif() endif()
@ -47,18 +47,18 @@ index a933d0ab64..fced38bc32 100644
# webgpu_dawn is only available as a fetched shared library, since Dawn's nested source # webgpu_dawn is only available as a fetched shared library, since Dawn's nested source
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 55d9e4941d..ff8a244651 100644 index 801cae4d6..d45150118 100644
--- a/external/CMakeLists.txt --- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt +++ b/external/CMakeLists.txt
@@ -117,6 +117,7 @@ if(NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS}) @@ -133,6 +133,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
endif() )
endif()
if(SLANG_ENABLE_SLANG_GLSLANG)
+if(NOT ${SLANG_USE_SYSTEM_SPIRV_TOOLS}) +if(NOT ${SLANG_USE_SYSTEM_SPIRV_TOOLS})
# SPIRV-Tools # SPIRV-Tools
set(SPIRV_TOOLS_BUILD_STATIC ON) set(SPIRV_TOOLS_BUILD_STATIC ON)
set(SPIRV_WERROR OFF) set(SPIRV_WERROR OFF)
@@ -138,11 +139,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG) @@ -148,11 +149,14 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
${system} ${system}
) )
endif() endif()
@ -73,7 +73,7 @@ index 55d9e4941d..ff8a244651 100644
if(NOT SLANG_OVERRIDE_GLSLANG_PATH) if(NOT SLANG_OVERRIDE_GLSLANG_PATH)
add_subdirectory(glslang EXCLUDE_FROM_ALL ${system}) add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})
else() else()
@@ -154,6 +158,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG) @@ -164,6 +168,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG)
) )
endif() endif()
endif() endif()

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang"; pname = "shader-slang";
version = "2025.8.1"; version = "2025.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shader-slang"; owner = "shader-slang";
repo = "slang"; repo = "slang";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-PScbMkJJ4rh8I8ID709GKtLmd5+4Z2x2BlFEdWpoesI="; hash = "sha256-5M/sKoCFVGW4VcOPzL8dVhTuo+esjINPXw76fnO7OEw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -131,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF"; ++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";
postInstall = ''
mv "$out/cmake" "$dev/cmake"
'';
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/slangc"; versionCheckProgram = "${placeholder "out"}/bin/slangc";
versionCheckProgramArg = "-v"; versionCheckProgramArg = "-v";

View File

@ -9,16 +9,16 @@
php84.buildComposerProject2 (finalAttrs: { php84.buildComposerProject2 (finalAttrs: {
pname = "snipe-it"; pname = "snipe-it";
version = "8.1.16"; version = "8.1.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grokability"; owner = "grokability";
repo = "snipe-it"; repo = "snipe-it";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-Eo0Z6aWbNniOcPIjsgWwy9d9TXfyYZPK3AtVxbAcjac="; hash = "sha256-S11RUvblLQNS+LX66zBlVATJTvOMNBxf//zpo+b4AB0=";
}; };
vendorHash = "sha256-bQFNpms8l85d74HoTEPx2fHZxbcjtbf1MoKj4lX3AMk="; vendorHash = "sha256-wWm7bB+TUzeRDRPYCL53c9/KspAdsHSEKK759ntiLWo=";
postInstall = '' postInstall = ''
snipe_it_out="$out/share/php/snipe-it" snipe_it_out="$out/share/php/snipe-it"

View File

@ -6,15 +6,15 @@
bzip2, bzip2,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "sysstat"; pname = "sysstat";
version = "12.7.4"; version = "12.7.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sysstat"; owner = "sysstat";
repo = "sysstat"; repo = "sysstat";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-ELmSzWnJ8vGwGPwY/5MFp/2gQhMXMjNG4bHtCplfQSc="; hash = "sha256-A0ja5/AtRNaXRXCXG2sJsvWrHPePgIIy/+rF+F7RvqI=";
}; };
buildInputs = [ gettext ]; buildInputs = [ gettext ];
@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.hensoko ]; maintainers = [ lib.maintainers.hensoko ];
}; };
} })

View File

@ -1,14 +1,14 @@
{ {
"darwin": { "darwin": {
"hash": "sha256-YXZbYooBqn3jGoWd+pvPs95Oq6V9sjEA2IC7dEsj2hs=", "hash": "sha256-nRI0xtLFyFqqNCZjIH07Dxut4OdZMO3KHHyPeNT3XKo=",
"version": "0.2025.07.02.08.36.stable_02" "version": "0.2025.07.09.08.11.stable_01"
}, },
"linux_x86_64": { "linux_x86_64": {
"hash": "sha256-CXCCJhR6Re423ZxWTheh0qus7sh7EqsSHz2x0Tz0t1E=", "hash": "sha256-zk3yHo3aimdmgA9bxbQrrZXXWYzNjJRB619PB/MRIG4=",
"version": "0.2025.07.02.08.36.stable_02" "version": "0.2025.07.09.08.11.stable_01"
}, },
"linux_aarch64": { "linux_aarch64": {
"hash": "sha256-uaOTKWuufzfu9T8DW86Nur9QSRIcnNYCCahCrEEDPpg=", "hash": "sha256-b208xahTJ0e0wABB2m2M7x6CAyHKr/7uHMF/cY4LVfM=",
"version": "0.2025.07.02.08.36.stable_02" "version": "0.2025.07.09.08.11.stable_01"
} }
} }

View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioautomower"; pname = "aioautomower";
version = "2025.6.0"; version = "1.2.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Thomas55555"; owner = "Thomas55555";
repo = "aioautomower"; repo = "aioautomower";
tag = version; tag = "v${version}";
hash = "sha256-6V3utjqCLQmO2iuWdn6kE8oz9XcJ/sCfeSMWmxL/2NE="; hash = "sha256-6V3utjqCLQmO2iuWdn6kE8oz9XcJ/sCfeSMWmxL/2NE=";
}; };

View File

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aioimmich"; pname = "aioimmich";
version = "0.10.1"; version = "0.10.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mib1185"; owner = "mib1185";
repo = "aioimmich"; repo = "aioimmich";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-+8AMa4TS2yzUoieRao+i8nfxXtbaKGx9cG/lgpKl3TM="; hash = "sha256-+k696FDr8LoJr90SfCNzjhwxC3776IN3kRLqdtPk/LI=";
}; };
postPatch = '' postPatch = ''

View File

@ -39,12 +39,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "coiled"; pname = "coiled";
version = "1.106.0"; version = "1.110.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-efy+ajZywr+/zREq1jnVbJm89cckRbmOX/0Jtc5AZCA="; hash = "sha256-g+c9PQ4CpDlGjBAW1qb+l/80Dnsd6xL1h30H9s/cjJw=";
}; };
build-system = [ build-system = [

View File

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyter-collaboration-ui"; pname = "jupyter-collaboration-ui";
version = "2.0.2"; version = "2.1.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "jupyter_collaboration_ui"; pname = "jupyter_collaboration_ui";
inherit version; inherit version;
hash = "sha256-YaNUu0+g5DgcqfLUte7pwsEvwyKCmxBjiOgQmVl/H/o="; hash = "sha256-EaoXDM1kcpzXyRFEtP9NLo2QAn1U44FXAX61NemdfMk=";
}; };
postPatch = '' postPatch = ''

View File

@ -46,7 +46,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "litellm"; pname = "litellm";
version = "1.73.6"; version = "1.74.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = "BerriAI"; owner = "BerriAI";
repo = "litellm"; repo = "litellm";
tag = "v${version}-stable"; tag = "v${version}-stable";
hash = "sha256-L4cd72mKkCyawHrNsU71PBwiI69QIWAD6HHVObNtq3I="; hash = "sha256-qjr08HHEELIwdL3IZ+GWJWGvIySTTX1nv46tYNBP53Y=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mizani"; pname = "mizani";
version = "0.13.5"; version = "0.14.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "has2k1"; owner = "has2k1";
repo = "mizani"; repo = "mizani";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-W88B8WCwIqjMhjoDJaksHBhvg/Sr0RRDwo9stniyzkM="; hash = "sha256-g7eGajqFLgFWxNKefuYVWF439zVohU8W1j3w91nblEY=";
}; };
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];

View File

@ -19,6 +19,7 @@
pytestCheckHook, pytestCheckHook,
pytest-cov-stub, pytest-cov-stub,
scikit-misc, scikit-misc,
writableTmpDirAsHomeHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -33,8 +34,26 @@ buildPythonPackage rec {
hash = "sha256-nTMu0zx13XepqQyrJrAvBCjjHdY02tlXlFk2kITHZfI="; hash = "sha256-nTMu0zx13XepqQyrJrAvBCjjHdY02tlXlFk2kITHZfI=";
}; };
# Fixes: TypeError: hue_pal.__init__() got an unexpected keyword argument 'color_space'
#
# In the mizani 0.14.0 release, hue_pal was changed to use HCL color space from HSL (or HSLuv) space.
# The previous functionality is still available with hls_pal.
postPatch = ''
substituteInPlace plotnine/scales/scale_color.py \
--replace-fail \
"from mizani.palettes import hue_pal" \
"from mizani.palettes import hls_pal" \
--replace-fail \
"hue_pal(" \
"hls_pal("
'';
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];
pythonRelaxDeps = [
"mizani"
];
dependencies = [ dependencies = [
matplotlib matplotlib
mizani mizani
@ -49,12 +68,9 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
pytest-cov-stub pytest-cov-stub
scikit-misc scikit-misc
writableTmpDirAsHomeHook
]; ];
preCheck = ''
export HOME=$(mktemp -d)
'';
pythonImportsCheck = [ "plotnine" ]; pythonImportsCheck = [ "plotnine" ];
disabledTests = [ disabledTests = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "publicsuffixlist"; pname = "publicsuffixlist";
version = "1.0.2.20250707"; version = "1.0.2.20250710";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-oA2VDeMEI7GzRiFPNUi7Q/lf5ZGyd0WT5Uaz1rc3Xs8="; hash = "sha256-3PkvYnym7WGcIh4J8xFCUbZB5C1fmikK0JddnfYqzVU=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -32,14 +32,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylance"; pname = "pylance";
version = "0.31.0"; version = "0.31.1";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lancedb"; owner = "lancedb";
repo = "lance"; repo = "lance";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-PjamcRvqLP8FRlyNw3+ucoQeVvSrlBEybDAugSTJqa4="; hash = "sha256-EYohbu+zhR3cLXkhM4izP/pIaFyefxc64eF8UAQojRU=";
}; };
sourceRoot = "${src.name}/python"; sourceRoot = "${src.name}/python";
@ -51,7 +51,7 @@ buildPythonPackage rec {
src src
sourceRoot sourceRoot
; ;
hash = "sha256-lL926HgxeRQjLOmhJ9nKvrUSWBaktS6kl20I3f0sIVA="; hash = "sha256-seYL4U/8Ac+V5NYJ3e2ji9BMkEnB+JxYX9coWFf7hGA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
flexmock,
git,
pytestCheckHook,
rpm,
setuptools-scm,
setuptools,
}:
buildPythonPackage rec {
pname = "specfile";
version = "0.36.0";
pyproject = true;
src = fetchFromGitHub {
owner = "packit";
repo = "specfile";
tag = version;
hash = "sha256-P15ilAK/LaSmDRviftTdj1bzoNqL3B0ESCHb6/avT2A=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [ rpm ];
nativeCheckInputs = [
git
flexmock
pytestCheckHook
];
pythonImportsCheck = [ "specfile" ];
disabledTests = [
# AssertionError
"test_update_tag"
"test_shell_expansions"
];
meta = {
description = "Library for parsing and manipulating RPM spec files";
homepage = "https://github.com/packit/specfile";
changelog = "https://github.com/packit/specfile/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}

View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yolink-api"; pname = "yolink-api";
version = "0.5.5"; version = "0.5.7";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "YoSmart-Inc"; owner = "YoSmart-Inc";
repo = "yolink-api"; repo = "yolink-api";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-K1KAuHpB6g02s8ZG7PqbhAB4NBxZX0ijXTQQgYL/Kn8="; hash = "sha256-LfpW2Y2uzqv2RhTItvjxF5XZrjCz/IIKov6OPIqKgF8=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -23,35 +23,35 @@
}, },
"35": { "35": {
"hashes": { "hashes": {
"aarch64-darwin": "ddf4f0838d92f604361eabea5cefc3557276e2ae3a9cff113c2bfc6b9204a114", "aarch64-darwin": "3330a8d349689a341cf0f5f126388ce2c1678c6f8760ba6456eb92d6a6fb87c4",
"aarch64-linux": "c3fc5a70de2e97679fd7124ebb57a7c16c465d76a00832b66a545a444eb8e9be", "aarch64-linux": "148ede01556ac18a24d97db60a13346115993a73da40963968da2e951260474f",
"armv7l-linux": "9b68c777af440e0ce4fc0f0dad244cd076586c6110dffde5823c88393bacc4df", "armv7l-linux": "fd5fda4137cf9d617c50315eb16710849419b5c60d9cc304b7b5615d8f0fa47f",
"headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
"x86_64-darwin": "93bae50a81f476b07d6bc0d652bd21ec592e61135047b2e4e69c5e931c67459d", "x86_64-darwin": "517a770abc9072b2f5335cc0af763fe2e2953fa89d9564640eb75f0eccb2794a",
"x86_64-linux": "94f3987a46b7cc39f16dc3428e304dd0dee679f3266fbea85ccfeb3daabb2c45" "x86_64-linux": "bddc5a6a1e496e9b87819315dcf188b9b0f7ea8f389d2f4b8326b8d7e0afe956"
}, },
"version": "35.6.0" "version": "35.7.1"
}, },
"36": { "36": {
"hashes": { "hashes": {
"aarch64-darwin": "3fd20b4aa0bf3eee25235ee114b1fbf7dd124b888f4c0ce5ee3592f147abd42d", "aarch64-darwin": "e79f3fd064cec1b8cd867cd567fbe69f3346520740e22748bfe9b5fb2f01f521",
"aarch64-linux": "f789ec88675bfbede2a661eee656a083bc585232792db9e925d017c33d9dc3ec", "aarch64-linux": "0e84759948f590538e7e0a00eafd128d68c9d3572b0cce0a8758a78a79de6e86",
"armv7l-linux": "9c9731c68227a3e4a634cd352802146081233e9129f39ea655c8b851a23e8fbf", "armv7l-linux": "94c5a1f3aec2cf72f5df820e8aa7d3e6fb5945bd6b75451ffef1efd08fa074aa",
"headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq", "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
"x86_64-darwin": "edbe907582e1e2a13d219dc3161f92db9867e452814894cc3b3c837679a3d827", "x86_64-darwin": "93d60bd40a9b41f126ab04442a1781ccdb7934d012d8606cfdebe059d922e308",
"x86_64-linux": "6a0decb3e382f32d4ab3db90aabd082ef9ee1154fe205808f887e228fdb2d355" "x86_64-linux": "27b4efb0d86a628407716268c2b4057c7b695390bd121f500c0daaea2e6c9af5"
}, },
"version": "36.6.0" "version": "36.7.1"
}, },
"37": { "37": {
"hashes": { "hashes": {
"aarch64-darwin": "31c57a288b262d17751e6bb6f3862bfaaa7eb2f0a5dfb17965013538d2ceeeb1", "aarch64-darwin": "2f381bb274fc0cb8d3a2bfeadc5dfd84b044305cdd02c7d19234e40e90ac03a9",
"aarch64-linux": "0aca9ed706f48e1b13c14d9379473c617d906bae8a4ee3a7cc1699ad8feea79b", "aarch64-linux": "fa2a494dd7541ef1184f20ebb56508c84f00e716ce43583cf62c4ba47d4dfcad",
"armv7l-linux": "88d33b77debc1d7c189350b9ba411bced78328dca86d4d7e805c4322502fc254", "armv7l-linux": "f50dc1e573bee739e2a22ffde1ae503b806e38a09a2ade448374e5181a4edf89",
"headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh", "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
"x86_64-darwin": "78e3c798b65d1e740e92bc2acac56b43aadf803be9fc3de799fd40407548dd83", "x86_64-darwin": "04112012bae4566b04f636e3101d2ced4522b2c60357a83eaec7cdbda7c036d2",
"x86_64-linux": "c03c227b2ac340e4a4093b7157e3290581bccf798bc3e0a40b280b0083453299" "x86_64-linux": "8f61fba601660839be53625197d836d0e8c8066a54ecc7be468093e4fb6c824b"
}, },
"version": "37.1.0" "version": "37.2.1"
} }
} }

View File

@ -23,35 +23,35 @@
}, },
"35": { "35": {
"hashes": { "hashes": {
"aarch64-darwin": "8ba99bae583c627ea97abeecb8326513e0795bc348dbf316839cdc0959815d4d", "aarch64-darwin": "2760c01ae0a292a1d20d3d2fab52120800d5734156e71671b458c6539fd24eee",
"aarch64-linux": "3ebe02af15986baaefee678a23bd65928d6a7a9d8b5c5a7477ffac3492d64fe7", "aarch64-linux": "038555b79c6f0fdf287cbd1943f9c8109e24c88290d6c4b2947159287129daca",
"armv7l-linux": "9e7fd420e22b6755f08f0b6a028db1375eacf6f792cf8b5bf972fe06631b9617", "armv7l-linux": "1b9350313d5fdf4774a51d7b8a4149d49d3ca86e789e682794b0499b54e9ae3f",
"headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp", "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
"x86_64-darwin": "e2fb710c6ede2f56d985e130cdbcc9b25cb1747e7d4cd7149c97c5a445aac0b4", "x86_64-darwin": "f9ff3b3eb747a2fa0e98e6c408a52e4272d05e477aaa3442debc587e823b385d",
"x86_64-linux": "59fdcbd69c17d73ea8736f77ab5c060e183704a54c60ff27dc7f7fd6d8ae362e" "x86_64-linux": "29d379865c8b72645b3d81585af308ebb96cca0c500191bfd042f844d01fa9b8"
}, },
"version": "35.6.0" "version": "35.7.1"
}, },
"36": { "36": {
"hashes": { "hashes": {
"aarch64-darwin": "5042087ef83d34433d751360cdc7f9a02cbc839c3008a781048624ceaede4ce1", "aarch64-darwin": "58620f79f034970abe41b7c3ae2e317dc8935d937ca07a37017ff528fb7affd3",
"aarch64-linux": "2a1386a4c5d0f5c01c2d1880378bfb26b5b972e3349f04205aeec0c17baa4d15", "aarch64-linux": "cd87231b0db40c8193e65bedf69451604c246867e56c7d52deb15dbdf4e7d527",
"armv7l-linux": "f66b00fa540094d687f2f3f05115d563289353f8d997b88a8605a509ea48cc33", "armv7l-linux": "cab434d3c281756ebd6f4fda4477a744a8081ac5eb8c938824d7391f8d5e2e32",
"headers": "1glxjnwmah7m51nw9pcf0mjnx19bjybxkcda233dfhyrxf2i8zsq", "headers": "09808hmprjpm33h5lx739i1yllwqy89n62ycaxrh6w42sncb2gm9",
"x86_64-darwin": "6cdd32f63a5b41ad653316e622655686f17ab26e4bf291beefc18705d504b98d", "x86_64-darwin": "bd851936d81cc4ddb2591ff2544ce6952ce49052ed6c929eb6c2a712e63ce4ea",
"x86_64-linux": "859c853712a4addb77d4fb1019e27063ef8825004bb93219e991cf5b4103ccb8" "x86_64-linux": "c4219caa0f8806e9ffabc7dccfb29ae2f9bca02a11fedd1090ad4c800c9783b1"
}, },
"version": "36.6.0" "version": "36.7.1"
}, },
"37": { "37": {
"hashes": { "hashes": {
"aarch64-darwin": "f17ed19aa221a0105f688e86de3b2ef2328fcd367cc0c3a1a4ef8470c82f4776", "aarch64-darwin": "20a854527dac40c643faefa3bd96cc7edc633399da825ff89b67ab5b03728b42",
"aarch64-linux": "b41893387748f0ab996979d16e38852c9c9a27a647f1931b8cc227b6bea079af", "aarch64-linux": "9b9810af731ca62c75ba49339943e4b251ccba8b0890f0933dfa831333a778ff",
"armv7l-linux": "abb11bb11e40f029061551bdc183b57515ee095de2019ec946bc63018454163d", "armv7l-linux": "5b36d24fe9c6b26b4734ac70f35f6fd50098175acb207fc87187be4fb38ebb4e",
"headers": "0wizghk8sbggxjcxyxga20021by5b6a4vdr92nkmaadpishs1ylh", "headers": "18w6pjbs29aqvdiscwl55ajvpib63y4q7g7y4q7hy0nr2vvzycja",
"x86_64-darwin": "e45df1088579f802258bce0f17ebb5791140ac7b568a6e17047cace76ab9f045", "x86_64-darwin": "8398fa0578a60eebb90436749d66d09e23bf4a0c705117bbfa455cb4a5b19746",
"x86_64-linux": "aed73451a604782e1be5826a6455e63264ddace4e2d4552a5a400fa16398ab96" "x86_64-linux": "413b3e0fb051953d97c920a480ebe364bcd668f31a5ae51c3472d4007bfe4dc5"
}, },
"version": "37.1.0" "version": "37.2.1"
} }
} }

View File

@ -57,10 +57,10 @@
}, },
"src/electron": { "src/electron": {
"args": { "args": {
"hash": "sha256-5yRo4cokuojRGS9gZWrhT0M9Gpklbley8nb9h9j5J4c=", "hash": "sha256-jdLAmuRf4nw/N8J7FDZwdG/+BXcoD2zVLsur+iNT4gM=",
"owner": "electron", "owner": "electron",
"repo": "electron", "repo": "electron",
"tag": "v35.6.0" "tag": "v35.7.1"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -386,10 +386,10 @@
}, },
"src/third_party/electron_node": { "src/third_party/electron_node": {
"args": { "args": {
"hash": "sha256-fGfV1IkJoAMQC49vZPgmoYW6OznOCJ4IIUNUiyLjIKE=", "hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=",
"owner": "nodejs", "owner": "nodejs",
"repo": "node", "repo": "node",
"tag": "v22.15.1" "tag": "v22.16.0"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -1305,8 +1305,8 @@
}, },
"electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars", "electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
"modules": "133", "modules": "133",
"node": "22.15.1", "node": "22.16.0",
"version": "35.6.0" "version": "35.7.1"
}, },
"36": { "36": {
"chrome": "136.0.7103.177", "chrome": "136.0.7103.177",
@ -1366,10 +1366,10 @@
}, },
"src/electron": { "src/electron": {
"args": { "args": {
"hash": "sha256-wqrEmC+nWLQtrTk3hIH4n3f9/uOYBX9H8VfooTqnues=", "hash": "sha256-Y6OnTmAleyYsmUn/F6kOFNkA4x+QQt00mx97UNWVIWU=",
"owner": "electron", "owner": "electron",
"repo": "electron", "repo": "electron",
"tag": "v36.6.0" "tag": "v36.7.1"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -1695,10 +1695,10 @@
}, },
"src/third_party/electron_node": { "src/third_party/electron_node": {
"args": { "args": {
"hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=", "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
"owner": "nodejs", "owner": "nodejs",
"repo": "node", "repo": "node",
"tag": "v22.16.0" "tag": "v22.17.0"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -2630,11 +2630,11 @@
}, },
"electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs", "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
"modules": "135", "modules": "135",
"node": "22.16.0", "node": "22.17.0",
"version": "36.6.0" "version": "36.7.1"
}, },
"37": { "37": {
"chrome": "138.0.7204.35", "chrome": "138.0.7204.97",
"chromium": { "chromium": {
"deps": { "deps": {
"gn": { "gn": {
@ -2644,15 +2644,15 @@
"version": "2025-05-21" "version": "2025-05-21"
} }
}, },
"version": "138.0.7204.35" "version": "138.0.7204.97"
}, },
"chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=", "chromium_npm_hash": "sha256-8d5VTHutv51libabhxv7SqPRcHfhVmGDSOvTSv013rE=",
"deps": { "deps": {
"src": { "src": {
"args": { "args": {
"hash": "sha256-0C2lONJHtUyEAQ8PNSk5Z4zCZa5XFI2LH4Ew9PgWfuU=", "hash": "sha256-jBRcCFsjel8zBJfcgrYy59SzyYphm01zscYtGo0YFhM=",
"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; ", "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": "138.0.7204.35", "tag": "138.0.7204.97",
"url": "https://chromium.googlesource.com/chromium/src.git" "url": "https://chromium.googlesource.com/chromium/src.git"
}, },
"fetcher": "fetchFromGitiles" "fetcher": "fetchFromGitiles"
@ -2691,10 +2691,10 @@
}, },
"src/electron": { "src/electron": {
"args": { "args": {
"hash": "sha256-c/Gm/qLWy96407+XVXF+4z99jNUQwkWSwlHxnvfCbK0=", "hash": "sha256-iJiKkKLDbcXnWDi0ZHq6xHB65cm1GsU1gffCPQSNc3Q=",
"owner": "electron", "owner": "electron",
"repo": "electron", "repo": "electron",
"tag": "v37.1.0" "tag": "v37.2.1"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -2732,8 +2732,8 @@
}, },
"src/third_party/angle": { "src/third_party/angle": {
"args": { "args": {
"hash": "sha256-jGnuunyWvu43LLpejJTcoSlhCukhv8pX2OAQ7n1adcU=", "hash": "sha256-b4bGxhtrsfmVdJo/5QT4/mtQ6hqxmfpmcrieqaT9/ls=",
"rev": "d1fb74c940fef262809f4a513039b70e94c91440", "rev": "df15136b959fc60c230265f75ee7fc75c96e8250",
"url": "https://chromium.googlesource.com/angle/angle.git" "url": "https://chromium.googlesource.com/angle/angle.git"
}, },
"fetcher": "fetchFromGitiles" "fetcher": "fetchFromGitiles"
@ -3028,10 +3028,10 @@
}, },
"src/third_party/electron_node": { "src/third_party/electron_node": {
"args": { "args": {
"hash": "sha256-rp48HOQB13nZJUByXaL8MMkHNFp/V0qtbDZgoFBIcJY=", "hash": "sha256-UFKajmYdtI645aCY8lX8X7mCZv7/k458u72cnqk25RI=",
"owner": "nodejs", "owner": "nodejs",
"repo": "node", "repo": "node",
"tag": "v22.16.0" "tag": "v22.17.0"
}, },
"fetcher": "fetchFromGitHub" "fetcher": "fetchFromGitHub"
}, },
@ -3954,8 +3954,8 @@
}, },
"src/v8": { "src/v8": {
"args": { "args": {
"hash": "sha256-MXQyDv45BDnLwKCqbueY2a5VBEgmf33Xy8WXLE9Rwsc=", "hash": "sha256-5y/yNZopnwtDrG+BBU6fMEi0yJJoYvsygQR+fl6vS/Y=",
"rev": "a14ab029e21658cba458b7001281c5d526e67636", "rev": "e5b4c78b54e8b033b2701db3df0bf67d3030e4c1",
"url": "https://chromium.googlesource.com/v8/v8.git" "url": "https://chromium.googlesource.com/v8/v8.git"
}, },
"fetcher": "fetchFromGitiles" "fetcher": "fetchFromGitiles"
@ -3963,7 +3963,7 @@
}, },
"electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs", "electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
"modules": "136", "modules": "136",
"node": "22.16.0", "node": "22.17.0",
"version": "37.1.0" "version": "37.2.1"
} }
} }

View File

@ -16741,6 +16741,8 @@ self: super: with self; {
speaklater3 = callPackage ../development/python-modules/speaklater3 { }; speaklater3 = callPackage ../development/python-modules/speaklater3 { };
specfile = callPackage ../development/python-modules/specfile { };
spectra = callPackage ../development/python-modules/spectra { }; spectra = callPackage ../development/python-modules/spectra { };
spectral-cube = callPackage ../development/python-modules/spectral-cube { }; spectral-cube = callPackage ../development/python-modules/spectral-cube { };