gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-05-21 12:08:07 +00:00
committed by GitHub
parent dc135551b4 4d9655a56c
commit 3554e6b818
85 changed files with 515 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/audio/spotifyd.nix
+2 -2
View File
@@ -28,7 +28,7 @@ in
type = lib.types.lines;
description = ''
(Deprecated) Configuration for Spotifyd. For syntax and directives, see
<https://docs.spotifyd.rs/config/File.html>.
<https://docs.spotifyd.rs/configuration/index.html#config-file>.
'';
};
@@ -40,7 +40,7 @@ in
};
description = ''
Configuration for Spotifyd. For syntax and directives, see
<https://docs.spotifyd.rs/config/File.html>.
<https://docs.spotifyd.rs/configuration/index.html#config-file>.
'';
};
};
nixos/modules/services/hardware/spacenavd.nix
+4 -1
View File
@@ -17,7 +17,10 @@ in
config = lib.mkIf cfg.enable {
systemd = {
packages = [ pkgs.spacenavd ];
services.spacenavd.enable = true;
services.spacenavd = {
enable = true;
wantedBy = [ "graphical.target" ];
};
};
};
}
nixos/modules/system/boot/loader/limine/limine-install.py
+18 -14
View File
@@ -74,6 +74,7 @@ def is_encrypted(device: str) -> bool:
def is_fs_type_supported(fs_type: str) -> bool:
return fs_type.startswith('vfat')
paths = {}
def get_copied_path_uri(path: str, target: str) -> str:
result = ''
@@ -85,6 +86,8 @@ def get_copied_path_uri(path: str, target: str) -> str:
if not os.path.exists(dest_path):
copy_file(path, dest_path)
else:
paths[dest_path] = True
path_with_prefix = os.path.join('/limine', target, dest_file)
result = f'boot():{path_with_prefix}'
@@ -203,7 +206,10 @@ def copy_file(from_path: str, to_path: str):
if not os.path.exists(dirname):
os.makedirs(dirname)
shutil.copyfile(from_path, to_path)
shutil.copyfile(from_path, to_path + ".tmp")
os.rename(to_path + ".tmp", to_path)
paths[to_path] = True
def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str:
if config(*config_path):
@@ -245,12 +251,10 @@ def main():
if not os.path.exists(limine_dir):
os.makedirs(limine_dir)
if os.path.exists(os.path.join(limine_dir, 'kernels')):
print(f'nuking {os.path.join(limine_dir, "kernels")}')
shutil.rmtree(os.path.join(limine_dir, 'kernels'))
os.makedirs(os.path.join(limine_dir, "kernels"))
else:
for dir, dirs, files in os.walk(limine_dir, topdown=True):
for file in files:
paths[os.path.join(dir, file)] = False
profiles = [('system', get_gens())]
@@ -270,13 +274,6 @@ def main():
default_entry: 2
''')
if os.path.exists(os.path.join(limine_dir, 'wallpapers')):
print(f'nuking {os.path.join(limine_dir, "wallpapers")}')
shutil.rmtree(os.path.join(limine_dir, 'wallpapers'))
if len(config('style', 'wallpapers')) > 0:
os.makedirs(os.path.join(limine_dir, 'wallpapers'))
for wallpaper in config('style', 'wallpapers'):
config_file += f'''wallpaper: {get_copied_path_uri(wallpaper, 'wallpapers')}\n'''
@@ -318,6 +315,8 @@ def main():
file.truncate()
file.write(config_file.strip())
paths[config_file_path] = True
for dest_path, source_path in config('additionalFiles').items():
dest_path = os.path.join(limine_dir, dest_path)
@@ -409,4 +408,9 @@ def main():
'Failed to deploy BIOS stage 1 Limine bootloader!\n' +
'You might want to try enabling the `boot.loader.limine.forceMbr` option.')
print("removing unused boot files...")
for path in paths:
if not paths[path]:
os.remove(path)
main()
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -5000,8 +5000,8 @@ let
mktplcRef = {
name = "uiua-vscode";
publisher = "uiua-lang";
version = "0.0.63";
hash = "sha256-qlBcnQyH5VbgmBlTvVi59OpYtyuVrJLoSuRIbrBGFVE=";
version = "0.0.64";
hash = "sha256-mASTMZhXsM8IzaMmHsWRmf+pf1EjXyWsBMFXTcq7Acw=";
};
meta = {
description = "VSCode language extension for Uiua";
pkgs/applications/emulators/libretro/cores/fbneo.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
version = "0-unstable-2025-05-09";
version = "0-unstable-2025-05-19";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
rev = "922fb2c9d7541b3554f7e5364a6072da241a9837";
hash = "sha256-LVQlWznu0wGlyFDexNaMqYjqHHNDeLLa6oeGvqGAjPQ=";
rev = "d2cf158e9ba82fc7dfec592452e6113121665c19";
hash = "sha256-dO1R0iIXEo2lrMSOJXlZBw2yXBfyB/1yFfRPYEEAojo=";
};
makefile = "Makefile";
pkgs/applications/emulators/libretro/cores/puae.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "puae";
version = "0-unstable-2025-05-10";
version = "0-unstable-2025-05-14";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-uae";
rev = "d3c925ef4fadee6c25bcef20d1f165141ba18ac3";
hash = "sha256-Wo58+4XSxEVtlKsHmW90Qhm+kdUHmDvN3d2gASNiIrw=";
rev = "fad7beb42c90a1a04829d465bed951a69cd36f8b";
hash = "sha256-pO45/IvgT2q5k0sBhSNZ6srJx4h2lYSjG/mKFJesGbc=";
};
makefile = "Makefile";
pkgs/applications/networking/mumble/default.nix
+1
View File
@@ -62,6 +62,7 @@ let
cmakeFlags = [
"-D g15=OFF"
"-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17
"-D BUILD_NUMBER=${lib.versions.patch source.version}"
] ++ (overrides.configureFlags or [ ]);
preConfigure = ''
pkgs/by-name/ai/airdrop-cli/package.nix
+38
View File
@@ -0,0 +1,38 @@
{
lib,
fetchFromGitHub,
swift,
swiftPackages,
swiftpm,
}:
# Doesn't build without using the same stdenv (and Clang) to build swift
swiftPackages.stdenv.mkDerivation {
pname = "airdrop-cli";
version = "0-unstable-2024-04-13";
src = fetchFromGitHub {
owner = "vldmrkl";
repo = "airdrop-cli";
rev = "dcdd570c3af3aae509ba7ad9fb26782b427f3a1a";
hash = "sha256-7gKKeedRayf27XrOhntu41AMXgxc7fqJRE8Jhbihh3o=";
};
nativeBuildInputs = [
swift
swiftpm
];
makeFlags = [
"PREFIX=$(out)"
];
meta = {
description = "Use Airdrop from the CLI on macOS written in Swift";
homepage = "https://github.com/vldmrkl/airdrop-cli";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Enzime ];
mainProgram = "airdrop";
platforms = lib.platforms.darwin;
};
}
pkgs/by-name/an/anytype/package.nix
+2 -1
View File
@@ -100,11 +100,12 @@ buildNpmPackage {
desktopItems = [
(makeDesktopItem {
name = "Anytype";
name = "anytype";
exec = "anytype";
icon = "anytype";
desktopName = "Anytype";
comment = description;
mimeTypes = [ "x-scheme-handler/anytype" ];
categories = [
"Utility"
"Office"
pkgs/by-name/aw/awsebcli/package.nix
+3 -2
View File
@@ -25,14 +25,14 @@ in
python.pkgs.buildPythonApplication rec {
pname = "awsebcli";
version = "3.23.3";
version = "3.24";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-elastic-beanstalk-cli";
tag = version;
hash = "sha256-Jaj90NRCwaxRQQlB4s4Us+liYiNohpwRsHuvKM5WmbU=";
hash = "sha256-i1CcOlrrtizvQMXKoj5xQYlmaTB8JWb4X5S+EcnQXps=";
};
pythonRelaxDeps = [
@@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec {
botocore
cement
colorama
fabric
pathspec
pyyaml
future
pkgs/by-name/az/azure-cli/extensions-manual.nix
+2 -2
View File
@@ -83,9 +83,9 @@
containerapp = mkAzExtension rec {
pname = "containerapp";
version = "1.1.0b4";
version = "1.1.0b5";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
hash = "sha256-d2pqanDERA54NGQwzO1S2D+WM1q5w1dmKjYbEdbknik=";
hash = "sha256-gC75NiDDRw4DVIDGiyfdCcFSAzdUgVNjyTfrgGgRd90=";
description = "Microsoft Azure Command-Line Tools Containerapp Extension";
propagatedBuildInputs = with python3Packages; [
docker
pkgs/by-name/be/beeper/package.nix
+2 -2
View File
@@ -9,10 +9,10 @@
}:
let
pname = "beeper";
version = "4.0.661";
version = "4.0.693";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
hash = "sha256-cKeHttoaV+UN5LXUArUxEcMjj3a4kjcj0EuiDriTtyE=";
hash = "sha256-+m4pmDYnn4fWAp8Ve7hjNaFClPU8tLIAVGQSJNlo/p0=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
pkgs/by-name/bi/bitrise/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "bitrise";
version = "2.31.0";
version = "2.31.1";
src = fetchFromGitHub {
owner = "bitrise-io";
repo = "bitrise";
rev = "v${version}";
hash = "sha256-zCa8qOrjavrUDi2n7KpSS5+hgDH9dCMwb6AjQ3bKACs=";
hash = "sha256-mSlN+7V25HFyTE5glz8vRzv2OplzsiEybBj71DThcSk=";
};
# many tests rely on writable $HOME/.bitrise and require network access
pkgs/by-name/ca/cargo-valgrind/package.nix
+8 -7
View File
@@ -6,35 +6,36 @@
makeWrapper,
valgrind,
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-valgrind";
version = "2.2.1";
version = "2.3.1";
src = fetchFromGitHub {
owner = "jfrimmel";
repo = "cargo-valgrind";
tag = version;
sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM=";
sha256 = "sha256-gr/s2dYCFmhwfXT3tqWPFpXQK2QaAhL7Aqnn1A3KjJI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A=";
cargoHash = "sha256-iNsGrbncZwCHXn/xuiI4Mw4F3FFWswEhwpIMI0xcFgU=";
passthru = {
updateScript = nix-update-script { };
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
valgrind # for tests where the executable is not wrapped yet
];
postInstall = ''
wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]}
'';
checkFlags = [
"--skip examples_are_runnable"
"--skip tests_are_runnable"
"--skip issue74"
"--skip default_cargo_project_reports_no_violations"
];
meta = with lib; {
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.425";
version = "3.2.427";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-tYK+GvWoSy3WOqVWqJ0w7EDJthNF+O5XvAPmWOVcjII=";
hash = "sha256-jdlTSWdojaM7M5g7yWCudZeCuQqaZZWFYJ0kWWup4ts=";
};
pythonRelaxDeps = [
pkgs/by-name/cl/cloudflare-warp/package.nix
+3 -3
View File
@@ -23,15 +23,15 @@
}:
let
version = "2025.2.600";
version = "2025.4.929";
sources = {
x86_64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
hash = "sha256-YY80XGTkKqE5pywuidvXPytv0/uMD4eMIcBlSpEV2Ps=";
hash = "sha256-9pofIjiKbe/8vKWe8bc1xoRE1PSexeDxnJcVqfxHd2c=";
};
aarch64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
hash = "sha256-ueZL0rX1FCkd7jFpM2c63eu11vFBCUVnl1uOGxPClZU=";
hash = "sha256-Y3VMuf9rxsvvfL/UVbW2d8hWHfEMhoDZcv/oahinFNo=";
};
};
in
pkgs/by-name/co/codegrab/package.nix
+49
View File
@@ -0,0 +1,49 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule (finalAttrs: {
pname = "codegrab";
version = "1.0.7";
src = fetchFromGitHub {
owner = "epilande";
repo = "codegrab";
tag = "v${finalAttrs.version}";
hash = "sha256-gKxvPcAZ8TnECAs3iMkFfZKdaq8vkLz/T9MUBWk4MfQ=";
leaveDotGit = true;
postFetch = ''
cd "$out"
git rev-parse --short HEAD > $out/COMMIT
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-u9pVOZOwK6xLdR4tlWN2eBoJZ2ziPEdJv78uCV0Suus=";
checkFlags = [
"-skip=TestParseSizeString"
];
ldflags = [
"-s"
"-w"
"-X=github.com/epilande/codegrab/internal/utils.Version=${finalAttrs.version}"
];
# ldflags based on metadata from git and source
preBuild = ''
ldflags+=" -X=github.com/epilande/codegrab/internal/utils.CommitSHA=$(cat COMMIT)"
'';
meta = {
description = "Interactive CLI tool for selecting and bundling code into a single, LLM-ready output file";
homepage = "https://github.com/epilande/codegrab";
changelog = "https://github.com/epilande/codegrab/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ taha-yassine ];
mainProgram = "grab";
};
})
pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{
"version" = "1.11.99";
"version" = "1.11.100";
"hashes" = {
"desktopSrcHash" = "sha256-vfbCcRd2vwdH45qDpavSJksU71S3adnK6KYS4jwKUkk=";
"desktopYarnHash" = "sha256-AP/qoYiOfq7Etc9TqeNjXM1nAJ1FlgzT2fPIimybeEk=";
"desktopSrcHash" = "sha256-qlKZkBPWcD1eyEetCrIKsSXmodg6DYCmENfY+UT7Khc=";
"desktopYarnHash" = "sha256-wuRAeb4IpA2Ihr3ohaMPvFsaMod4Bg8o9lm8yzStwmk=";
};
}
pkgs/by-name/el/element-desktop/update.sh
+28 -33
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
#!nix-shell -i bash -p nix coreutils prefetch-yarn-deps jq curl
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."
@@ -12,54 +12,49 @@ version="$1"
set -euo pipefail
if [ -z "$version" ]; then
version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
version="$(curl -fsSL "https://api.github.com/repos/element-hq/element-desktop/releases/latest" | jq -r '.tag_name')"
fi
# strip leading "v"
version="${version#v}"
# Element Web
web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version"
web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash)
cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1
web_tmpdir=$(mktemp -d)
trap 'rm -rf "$web_tmpdir"' EXIT
nixflags=(
--extra-experimental-features
"nix-command flakes"
)
pushd $web_tmpdir
wget -q "$web_src/yarn.lock"
web_yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
# HACK: prefetch-yarn-deps hashes may output extra clutter on stdout (!) so
# we'll need to get the last line, last word
fixupHash() {
local sorta_yarn_hash="$(tail -n1 <<< "$1")"
local almost_yarn_hash="${sorta_yarn_hash##* }"
local yarn_hash="$(nix "${nixflags[@]}" hash convert --hash-algo sha256 "$almost_yarn_hash")"
# Element Desktop
desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version"
desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash)
printf "%s" "$yarn_hash"
}
desktop_tmpdir=$(mktemp -d)
trap 'rm -rf "$desktop_tmpdir"' EXIT
getHashes() {
variant="$1"
output="$2"
pushd $desktop_tmpdir
wget -q "$desktop_src/yarn.lock"
desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
local url="github:element-hq/element-$variant/v$version"
local src="$(nix "${nixflags[@]}" flake prefetch --json "$url")"
local src_hash="$(jq -r ".hash" <<< "$src")"
local src_path="$(jq -r ".storePath" <<< "$src")"
local yarn_hash="$(fixupHash "$(prefetch-yarn-deps "$src_path/yarn.lock")")"
cat > ../element-web-unwrapped/element-web-pin.nix << EOF
cat > "$output" << EOF
{
"version" = "$version";
"hashes" = {
"webSrcHash" = "$web_src_hash";
"webYarnHash" = "$web_yarn_hash";
"${variant}SrcHash" = "$src_hash";
"${variant}YarnHash" = "$yarn_hash";
};
}
EOF
}
cat > element-desktop-pin.nix << EOF
{
"version" = "$version";
"hashes" = {
"desktopSrcHash" = "$desktop_src_hash";
"desktopYarnHash" = "$desktop_yarn_hash";
};
}
EOF
getHashes web ../element-web-unwrapped/element-web-pin.nix
getHashes desktop element-desktop-pin.nix
pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{
"version" = "1.11.99";
"version" = "1.11.100";
"hashes" = {
"webSrcHash" = "sha256-yTOvvoTt6HnXq+QFshYjpt0q5hpcR8cjpxgoyBtS2X0=";
"webYarnHash" = "sha256-kgwM1zo7/lRS2g/4fHuT/Z/fExOg6hWAJ7xoKt7vYA8=";
"webSrcHash" = "sha256-FiYjWOJ50Vhbs9vgEqK64HTVtwSuy4/BZAkPK4c6DXQ=";
"webYarnHash" = "sha256-C1yVJHU9ClTJHQfMLkdZEeRWVVu68eJp2kxnIlLinY8=";
};
}
pkgs/by-name/ex/exploitdb/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2025-05-10";
version = "2025-05-19";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-YcSkBnzw3iMuD0MtpqtUq1gOBoj2ptigI63cI1wBibY=";
hash = "sha256-Tk2iPWiybUlsmiHbjJTNEMkCuXVeam49PiWrl4mVzhY=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/fo/foundry/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "foundry";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "foundry-rs";
repo = "foundry";
tag = "v${version}";
hash = "sha256-bFr1mzp1evaCJsVj5H20ShoaGMJ1TPB/91Yd37ZGNsI=";
hash = "sha256-hHvHnSq6XarfofX0G5RE2hIai2eY8Nf1aqgJ5Z6ZuDg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-v+7sykIVdrzBOkNVnpgUnCUG7SUf2UToq9P539UAOH4=";
cargoHash = "sha256-spB89RmR6+9L+zo2YOl7fBxcmRdLUELXr8OmUt3waO4=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/gf/gf/package.nix
+6 -3
View File
@@ -7,6 +7,7 @@
pkg-config,
gdb,
freetype,
nix-update-script,
freetypeSupport ? true,
withExtensions ? true,
extraFlags ? "",
@@ -15,13 +16,13 @@
stdenv.mkDerivation {
pname = "gf";
version = "0-unstable-2025-02-04";
version = "0-unstable-2025-04-11";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
rev = "9c1686439f97ae6e1ca8f1fb785b545303adfebc";
hash = "sha256-0uABsjAVn+wAN8hMkM38CepSV4gYtIL0WHDq25TohZ0=";
rev = "162249220bde1c9fef7d87f8bb9128be9323d93f";
hash = "sha256-wP8ELlqtMwYv6/jQzKahaX7vlMKLUBgxm5Io49tphsM=";
};
nativeBuildInputs = [
@@ -67,6 +68,8 @@ stdenv.mkDerivation {
wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath [ gdb ]}
'';
passthru.updateScript = nix-update-script { extraArgs = lib.singleton "--version=branch"; };
meta = with lib; {
description = "GDB Frontend";
homepage = "https://github.com/nakst/gf";
pkgs/by-name/ip/iplookup-gtk/package.nix
+3 -3
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonPackage rec {
pname = "iplookup-gtk";
version = "0.4.0";
version = "0.4.1";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Bytezz";
repo = "IPLookup-gtk";
tag = "v${version}";
hash = "sha256-pO05WDNb9AMKXm8OqzOnk77T5sLBdURV90FgQKL9oAw=";
hash = "sha256-WXLT7ThuD4/alb44mkGNLJjZPiWgNmSUqsRiO+cjdPk=";
};
nativeBuildInputs = [
@@ -49,7 +49,7 @@ python3Packages.buildPythonPackage rec {
meta = {
description = "Find info about an IP address";
homepage = "https://github.com/Bytezz/IPLookup-gtk";
changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}";
changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.tag}";
license = lib.licenses.gpl3Plus;
mainProgram = "iplookup";
maintainers = with lib.maintainers; [ aleksana ];
pkgs/by-name/li/limine/package.nix
+3 -2
View File
@@ -42,14 +42,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "9.3.1";
version = "9.3.2";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-KRHWXrsJ1l9gFq0j2gB/MQobqNe3Z8rknrs4m7WMRFU=";
hash = "sha256-aYzNgErrlRIIv4hmekdoPMCZ4g5xDYIeTUJhEkfuuJQ=";
};
enableParallelBuilding = true;
@@ -113,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
lzcunt
phip1611
prince213
surfaceflinger
];
};
pkgs/by-name/me/meli/package.nix
+3 -4
View File
@@ -25,7 +25,7 @@
rustPlatform.buildRustPackage rec {
pname = "meli";
version = "0.8.11";
version = "0.8.12";
src = fetchzip {
urls = [
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
"https://codeberg.org/meli/meli/archive/v${version}.tar.gz"
"https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"
];
hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI=";
hash = "sha256-Dp0WI1Cl+m7oxZ/4zEi0TtOwqRX681jZht9bNMFnmsU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ=";
cargoHash = "sha256-DJtk8xLppXdl9sSt6GcaXwZ5MEIY/s/z/bdcdr8YdLw=";
# Needed to get openssl-sys to use pkg-config
OPENSSL_NO_VENDOR = 1;
@@ -75,7 +75,6 @@ rustPlatform.buildRustPackage rec {
];
meta = with lib; {
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
description = "Terminal e-mail client and e-mail client library";
mainProgram = "meli";
homepage = "https://meli.delivery";
pkgs/by-name/mp/mprocs/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mprocs";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "pvolok";
repo = "mprocs";
tag = "v${version}";
hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw=";
hash = "sha256-/FuvejcZoaHzlYh4zYDVS1WimzNMNbRZyM39OBi02VA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ=";
cargoHash = "sha256-i9oQT2vpA5nAgQgVpxxfRPvCIb4w1emt1YsjMS6UPIk=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/mu/museum/package.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildGoModule rec {
pname = "museum";
version = "1.0.4";
version = "1.0.10";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "server" ];
rev = "photos-v${version}";
hash = "sha256-tFXOLzGGMrjVImOOl3RGaX3i/FwhjbGqKRdxv/xxKTs=";
hash = "sha256-CX12JrKlI7FMizk29LXO5e5i7pmgjzni/RY97020UZg=";
};
vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec=";
pkgs/by-name/no/noto-fonts/package.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenvNoCC.mkDerivation rec {
pname = "noto-fonts${suffix}";
version = "2025.04.01";
version = "2025.05.01";
src = fetchFromGitHub {
owner = "notofonts";
repo = "notofonts.github.io";
rev = "noto-monthly-release-${version}";
hash = "sha256-xR3P6RWb1pHdOuCbb+kQXqv3Ip3+2yXAVqeZ+f2M3VU=";
hash = "sha256-voOizeGK7fU2bGLoNBhdNIfleDCu84nFiEHo5lCIye4=";
};
outputs = [
pkgs/by-name/pa/pan/package.nix
+30 -30
View File
@@ -1,12 +1,11 @@
{
spellChecking ? true,
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
cmake,
pkg-config,
gtk3,
gtkspell3,
gspell,
gmime3,
gettext,
intltool,
@@ -14,33 +13,34 @@
libxml2,
libnotify,
gnutls,
makeWrapper,
wrapGAppsHook3,
gnupg,
spellChecking ? true,
gnomeSupport ? true,
libsecret,
gcr,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pan";
version = "0.158";
version = "0.162";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "pan";
rev = "v${version}";
hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA=";
tag = "v${finalAttrs.version}";
hash = "sha256-YXZA0WguDAV/CCqjdkNWB2bnkBwDN7AfWtaSaJ1ztmM=";
};
nativeBuildInputs = [
autoreconfHook
cmake
pkg-config
gettext
intltool
itstool
libxml2
makeWrapper
wrapGAppsHook3
];
buildInputs =
@@ -50,37 +50,37 @@ stdenv.mkDerivation rec {
libnotify
gnutls
]
++ lib.optional spellChecking gtkspell3
++ lib.optionals spellChecking [ gspell ]
++ lib.optionals gnomeSupport [
libsecret
gcr
];
configureFlags =
[
"--with-dbus"
"--with-gtk3"
"--with-gnutls"
"--enable-libnotify"
]
++ lib.optional spellChecking "--with-gtkspell"
++ lib.optional gnomeSupport "--enable-gkr";
cmakeFlags = [
(lib.cmakeBool "WANT_GSPELL" spellChecking)
(lib.cmakeBool "WANT_GKR" gnomeSupport)
(lib.cmakeBool "ENABLE_MANUAL" true)
(lib.cmakeBool "WANT_GMIME_CRYPTO" true)
(lib.cmakeBool "WANT_WEBKIT" false) # We don't have webkitgtk_3_0
(lib.cmakeBool "WANT_NOTIFY" true)
];
postInstall = ''
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnupg ]})
'';
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "GTK-based Usenet newsreader good at both text and binaries";
mainProgram = "pan";
homepage = "http://pan.rebelbase.com/";
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
license = with licenses; [
homepage = "http://pan.rebelbase.com";
maintainers = with lib.maintainers; [
aleksana
emaryn
];
platforms = lib.platforms.linux;
license = with lib.licenses; [
gpl2Only
fdl11Only
];
};
}
})
pkgs/by-name/pa/parca-agent/package.nix
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "parca-agent";
version = "0.38.1";
version = "0.38.2";
src = fetchFromGitHub {
owner = "parca-dev";
repo = "parca-agent";
tag = "v${version}";
hash = "sha256-8xzRHOqiGaAKkVlFv0YLj76xJhr6+ljFyGa819iOPiY=";
hash = "sha256-6TjO5Fb6+zCrVz/Edq41H3tTbJLtYD1k/OKt01ms2dY=";
fetchSubmodules = true;
};
proxyVendor = true;
vendorHash = "sha256-o7wf0n2XHZnfURJfQqgvU9bXfFrbFXIo3rt5cqYCx6w=";
vendorHash = "sha256-Qm5ezWjMTYrhulHS5ALs4yrCInhqsxRc9RvCh9vv3GE=";
buildInputs = [
stdenv.cc.libc.static
pkgs/by-name/qb/qbittorrent-enhanced/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
(qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
version = "5.0.5.10";
version = "5.1.0.10";
src = fetchFromGitHub {
owner = "c0re100";
repo = "qBittorrent-Enhanced-Edition";
rev = "release-${version}";
hash = "sha256-wMPzasrWmPG+iOwUBkbswSMQQBJxq03GVlQg5ck54vQ=";
hash = "sha256-VJqQFx9OvfuGyIfot9CgKiyGawOD3mYIdux20Atjea0=";
};
meta = old.meta // {
pkgs/by-name/ru/rustdesk-flutter/package.nix
+3 -5
View File
@@ -64,14 +64,14 @@ let
in
flutter.buildFlutterApplication rec {
pname = "rustdesk";
version = "1.3.9";
version = "1.4.0";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
tag = version;
fetchSubmodules = true;
hash = "sha256-DvFsHrYLdAaEh2cXF8Zp5AvyG8Okiy2guW/r2x7Kz4U=";
hash = "sha256-fuS2ENrMlzk1AIZGZp4M3ZbsHks5TFW2pRQEGzsTThQ=";
};
strictDeps = true;
@@ -101,7 +101,7 @@ flutter.buildFlutterApplication rec {
src
patches
;
hash = "sha256-D64W2+eBR2RGiN+puJW3QIO1334SgOOHv5fws5r3wmg=";
hash = "sha256-9DjfGfTs8/J9XPZmWXCibyRib1/abnWzznQn6A5Tw2I=";
};
dontCargoBuild = true;
@@ -153,8 +153,6 @@ flutter.buildFlutterApplication rec {
patches = [
./make-build-reproducible.patch
# Multiple version of core-foundation-sys will make fetchCargoVendor unhappy. Keep one of it.
./update-cargo-lock.patch
];
prepareBuildRunner = ''
pkgs/by-name/ru/rustdesk-flutter/update-cargo-lock.patch
-40
View File
@@ -1,40 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index e8ed6c42e..3e90da8fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1178,7 +1178,7 @@ name = "core-foundation"
version = "0.9.3"
source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
dependencies = [
- "core-foundation-sys 0.8.6 (git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd)",
+ "core-foundation-sys",
"libc",
]
@@ -1188,7 +1188,7 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
dependencies = [
- "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys",
"libc",
]
@@ -1198,14 +1198,6 @@ version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd"
-dependencies = [
- "objc2-encode 2.0.0-pre.2",
-]
-
[[package]]
name = "core-graphics"
version = "0.22.3"
--
2.47.2
pkgs/by-name/sc/scorched3d/gcc14-fix.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/configure b/configure
index 59414ee..c53064d 100755
--- a/configure
+++ b/configure
@@ -4881,7 +4881,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
int main(int argc, char *argv[])
{
- alutInit(argc, argv);
+ alutInit(&argc, argv);
return 0;
}
#undef main
pkgs/by-name/sc/scorched3d/package.nix
+1
View File
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
url = "https://sources.debian.org/data/main/s/scorched3d/44%2Bdfsg-7/debian/patches/wx3.0-compat.patch";
sha256 = "sha256-Y5U5yYNT5iMqhdRaDMFtZ4K7aD+pugFZP0jLh7rdDp8=";
})
./gcc14-fix.patch
];
sourceRoot = "scorched";
pkgs/by-name/so/source-meta-json-schema/package.nix
+2 -2
View File
@@ -5,7 +5,7 @@
cmake,
}:
let
version = "9.2.4";
version = "9.3.1";
in
stdenv.mkDerivation (finalAttrs: {
pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "sourcemeta";
repo = "jsonschema";
rev = "v${version}";
hash = "sha256-IQuXybTpdVdPiYVpb9BffZdUs0TxKqA1HkzxS/gi+pw=";
hash = "sha256-uqx2GBG4sTmFWexTr8fCP9r/o37d3vTD93giB/OEmac=";
};
nativeBuildInputs = [
pkgs/by-name/sq/sqlitecpp/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sqlitecpp";
version = "3.3.2";
version = "3.3.3";
src = fetchFromGitHub {
owner = "SRombauts";
repo = "sqlitecpp";
rev = finalAttrs.version;
sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI=";
hash = "sha256-RSNJGfvIvNfk+/Awzh06tDi/TA5Wc35X8ya0X5mP9IE=";
};
nativeBuildInputs = [
pkgs/by-name/sy/sydbox/package.nix
+3 -3
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sydbox";
version = "3.32.7";
version = "3.34.0";
outputs = [
"out"
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "Sydbox";
repo = "sydbox";
tag = "v${finalAttrs.version}";
hash = "sha256-l1CWCSd1ORw0Pvt9tcvbie5hEcysw0MoFhKxheIevEA=";
hash = "sha256-m4iooJzc/TQguWF4qVOvuNabFmijsTtlzjz7IllNN74=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-3eFYf8+ESNLBgV7thEWseocPQG7mCrjCt42FfzEnB6Q=";
cargoHash = "sha256-B/JSJKCLYnNjHFEDdFdGTdXuirA2zRKL+mr36a0Fqh0=";
nativeBuildInputs = [
mandoc
pkgs/by-name/te/tektoncd-cli/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-LcYd8v6+at/GqlEV2Qkj5g+WNiTBfnQuhDtpP7lmnuk=";
sha256 = "sha256-X+zFYPoHf8Q1K0bLjrsnwOZxxAeJCzgKqmr3FYK5AKA=";
};
vendorHash = null;
pkgs/by-name/ty/ty/package.nix
+7 -4
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.1-alpha.5";
version = "0.0.1-alpha.6";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-F3q6IpS7dk0jISG+aREKpPxwWHO5UdSfslOnclYa0R8=";
hash = "sha256-0/Vzc5N4w23dcRLSWMn/hcgtx3dOpJagPBCiNjCT3mI=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
cargoHash = "sha256-NXhO+xYHCz269jxEuiB8yMgaX21Z8wAySVl9XOc7W60=";
cargoHash = "sha256-p3D2sHMyeQY6hZsX17REidyofuQsIkunGLP8IrO1+8A=";
nativeBuildInputs = [ installShellFiles ];
@@ -83,6 +83,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
changelog = "https://github.com/astral-sh/ty/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
mainProgram = "ty";
maintainers = [ lib.maintainers.bengsparks ];
maintainers = with lib.maintainers; [
bengsparks
GaetanLepage
];
};
})
pkgs/by-name/ui/uiua/stable.nix
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.15.1";
version = "0.16.0";
tag = version;
hash = "sha256-PTpGjJCTqc8bgCfKoq8Bh5eb5vWc1ZjWtdZXMY2j2f8=";
cargoHash = "sha256-UAwlnJsZfHnKzchhn79cBsX3iRPV+N52szRMiv2NBno=";
hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs=";
cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs=";
updateScript = ./update-stable.sh;
}
pkgs/by-name/ui/uiua/unstable.nix
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.16.0-rc.1";
version = "0.16.0";
tag = version;
hash = "sha256-c17CBFPBWe0UR+qwRMLCPGeaozVBq6aRv3haVDoIyyA=";
cargoHash = "sha256-8MulQU6SU1M/ITmPLtYa8SShXRsp7NTMhEZRXEgY5zw=";
hash = "sha256-/BSn0B/yJY9rmGLBxnCwCNf2BGQOsbzpHu6Ww4NQpAs=";
cargoHash = "sha256-sxCcnfI3i81oDsmAingNesNP3CAAnvKtSoFPYP8uaqs=";
updateScript = ./update-unstable.sh;
}
pkgs/by-name/vi/victoriametrics/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.116.0";
version = "1.117.1";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-iXMn1C5dUzsZSNwv4PqS4iMsTlxjhj9U9YLJHy8WGHs=";
hash = "sha256-Y3Ai5e9bJnGlWfxOMWMhesJ/eHrklSbR+YmR1EgzFS0=";
};
vendorHash = null;
pkgs/by-name/wa/wastebin/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "wastebin";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "matze";
repo = "wastebin";
rev = version;
hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg=";
hash = "sha256-7+Ufin68gMQtKv8SC8Gmn0Ra2qpumsKYgpURTkVqzt8=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc=";
cargoHash = "sha256-j9Wpo3N1kwCvjDEqmn87rGSYFVw1ZGkSps72zVpXNls=";
nativeBuildInputs = [
pkg-config
pkgs/development/beam-modules/ex_doc/default.nix
+2 -2
View File
@@ -14,12 +14,12 @@
let
pname = "ex_doc";
version = "0.38.0";
version = "0.38.1";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "${pname}";
rev = "v${version}";
hash = "sha256-NyRvEN07PBk1ZCXLu/lu+d1SYO8fXyiUEcpFZ8cSEng=";
hash = "sha256-lsz+r/7Pre15qWOqla9j712I6HExyHfvBfupmKuePmI=";
};
in
mixRelease {
pkgs/development/compilers/crystal/default.nix
+9 -1
View File
@@ -317,5 +317,13 @@ rec {
doCheck = false;
};
crystal = crystal_1_15;
crystal_1_16 = generic {
version = "1.16.3";
sha256 = "sha256-U9H1tHUMyDNicZnXzEccDki5bGXdV0B2Wu2PyCksPVI=";
binary = binaryCrystal_1_10;
llvmPackages = llvmPackages_18;
doCheck = false;
};
crystal = crystal_1_16;
}
pkgs/development/interpreters/clojure/default.nix
+7
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
bashNonInteractive,
fetchurl,
installShellFiles,
jdk,
@@ -24,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
];
buildInputs = [
bashNonInteractive
];
strictDeps = true;
# See https://github.com/clojure/brew-install/blob/1.10.3/src/main/resources/clojure/install/linux-install.sh
installPhase =
let
pkgs/development/libraries/mesa/common.nix
+2 -2
View File
@@ -5,14 +5,14 @@
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
rec {
pname = "mesa";
version = "25.0.6";
version = "25.1.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
hash = "sha256-SuSs8rwcu3GizOFfoUQZkVfwS1gxihgnmIGnD90YS54=";
hash = "sha256-Vk5sE7D8XHDOtxq0ax2a3FmQFWp7IDP4Y510EpnKWo4=";
};
meta = {
pkgs/development/libraries/mesa/default.nix
+22 -8
View File
@@ -16,6 +16,7 @@
libdrm,
libgbm,
libglvnd,
libpng,
libunwind,
libva-minimal,
libvdpau,
@@ -45,10 +46,12 @@
galliumDrivers ?
[
"asahi" # Apple AGX, built on non-aarch64 for cross tools
"d3d12" # WSL emulated GPU (aka Dozen)
"iris" # new Intel (Broadwell+)
"llvmpipe" # software renderer
"nouveau" # Nvidia
"panfrost" # ARM Mali Midgard and up (T/G series), built on non-ARM for cross tools
"r300" # very old AMD
"r600" # less old AMD
"radeonsi" # new AMD (GCN+)
@@ -61,7 +64,6 @@
"etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs)
"freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
"lima" # ARM Mali 4xx
"panfrost" # ARM Mali Midgard and up (T/G series)
"vc4" # Broadcom VC4 (Raspberry Pi 0-3)
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
@@ -75,6 +77,7 @@
vulkanDrivers ?
[
"amd" # AMD (aka RADV)
"asahi" # Apple AGX, built on non-aarch64 for cross tools
"intel" # new Intel (aka ANV)
"microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
"nouveau" # Nouveau (aka NVK)
@@ -103,8 +106,10 @@
],
vulkanLayers ? [
"device-select"
"overlay"
"intel-nullhw"
"overlay"
"screenshot"
"vram-report-limit"
],
mesa,
mesa-gl-headers,
@@ -161,7 +166,6 @@ stdenv.mkDerivation {
patches = [
./opencl.patch
./system-gbm.patch
];
postPatch = ''
@@ -223,7 +227,6 @@ stdenv.mkDerivation {
(lib.mesonBool "libgbm-external" true)
(lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
(lib.mesonBool "osmesa" false) # deprecated upstream
# Only used by xf86-video-vmware, which has more features than VMWare's KMS driver,
# so we're keeping it for now. Should be removed when that's no longer the case.
@@ -245,14 +248,14 @@ stdenv.mkDerivation {
# Rusticl, new OpenCL frontend
(lib.mesonBool "gallium-rusticl" true)
(lib.mesonOption "gallium-rusticl-enable-drivers" "auto")
# meson auto_features enables this, but we do not want it
(lib.mesonEnable "android-libbacktrace" false)
(lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
# Build and install extra tools for cross
(lib.mesonBool "install-mesa-clc" true)
(lib.mesonBool "install-precomp-compiler" true)
# Enable more sensors in gallium-hud
(lib.mesonBool "gallium-extra-hud" true)
# Disable valgrind on targets where it's not available
(lib.mesonEnable "valgrind" withValgrind)
@@ -260,6 +263,12 @@ stdenv.mkDerivation {
++ lib.optionals enablePatentEncumberedCodecs [
(lib.mesonOption "video-codecs" "all")
]
++ lib.optionals (!needNativeCLC) [
# Build and install extra tools for cross
(lib.mesonOption "tools" "asahi,panfrost")
(lib.mesonBool "install-mesa-clc" true)
(lib.mesonBool "install-precomp-compiler" true)
]
++ lib.optionals needNativeCLC [
(lib.mesonOption "mesa-clc" "system")
(lib.mesonOption "precomp-compiler" "system")
@@ -277,6 +286,7 @@ stdenv.mkDerivation {
libdrm
libgbm
libglvnd
libpng
libunwind
libva-minimal
libvdpau
@@ -348,9 +358,13 @@ stdenv.mkDerivation {
doCheck = false;
postInstall = ''
moveToOutput bin/asahi_clc $cross_tools
moveToOutput bin/intel_clc $cross_tools
moveToOutput bin/mesa_clc $cross_tools
moveToOutput bin/vtn_bindgen $cross_tools
moveToOutput bin/panfrost_compile $cross_tools
moveToOutput bin/panfrost_texfeatures $cross_tools
moveToOutput bin/panfrostdump $cross_tools
moveToOutput bin/vtn_bindgen2 $cross_tools
moveToOutput "lib/lib*OpenCL*" $opencl
# Construct our own .icd file that contains an absolute path.
pkgs/development/libraries/mesa/opencl.patch
+2 -2
View File
@@ -13,8 +13,8 @@ index c150bff74ff..37fa7f0531b 100644
diff --git a/meson_options.txt b/meson_options.txt
index 82324617884..4bde97a8568 100644
--- a/meson_options.txt
+++ b/meson_options.txt
--- a/meson.options
+++ b/meson.options
@@ -738,3 +738,10 @@ option(
'none', 'dri2'
],
pkgs/development/libraries/mesa/system-gbm.patch
-195
View File
@@ -1,195 +0,0 @@
commit 69914d79c3d86b0aee80665c51074cf8cc55f660
Author: K900 <me@0upti.me>
Date: 2025-03-05 13:14:02 +0300
meson: support building with system libgbm
This is the next step towards making libgbm just a loader.
diff --git a/meson.build b/meson.build
index 4766ce838ba..300a6bb0cc8 100644
--- a/meson.build
+++ b/meson.build
@@ -2377,7 +2377,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ')
gbm_summary = {'Enabled': with_gbm}
if with_gbm
- gbm_summary += {'Backends path': gbm_backends_path}
+ gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path}
endif
summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ')
diff --git a/meson_options.txt b/meson_options.txt
index 2622cf1d235..7bf8ae8a1c5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -329,6 +329,13 @@ option(
description : 'Build support for gbm platform'
)
+option(
+ 'libgbm-external',
+ type: 'boolean',
+ value: false,
+ description: 'Whether to use external libgbm (default: use in-tree copy)'
+)
+
option(
'gbm-backends-path',
type : 'string',
diff --git a/src/egl/meson.build b/src/egl/meson.build
index a02b83419c4..ae4b0c5e063 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -108,9 +108,8 @@ if with_dri
endif
if with_gbm and not with_platform_android
files_egl += files('drivers/dri2/platform_drm.c')
- link_for_egl += libgbm
- incs_for_egl += [inc_gbm, include_directories('../gbm/main')]
- deps_for_egl += dep_libdrm
+ incs_for_egl += [include_directories('../gbm/backends/dri')]
+ deps_for_egl += [dep_libdrm, dep_gbm]
endif
if with_platform_wayland
deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers]
diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
index 339e9376c3d..f1a0bb18ed8 100644
--- a/src/gallium/targets/dril/dril_target.c
+++ b/src/gallium/targets/dril/dril_target.c
@@ -25,7 +25,7 @@
#include <dlfcn.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include "gbm/main/gbm.h"
+#include <gbm.h>
#include "drm-uapi/drm_fourcc.h"
#define EGL_PLATFORM_GBM_MESA 0x31D7
diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build
index 7cfa982ffe1..22b955b9074 100644
--- a/src/gallium/targets/dril/meson.build
+++ b/src/gallium/targets/dril/meson.build
@@ -51,10 +51,10 @@ dril_dri = shared_library(
link_depends : dril_link_depends,
link_with : [
libgallium,
- libgbm,
],
dependencies : [
idep_mesautil,
+ dep_gbm,
],
# Will be deleted during installation, see install_megadrivers.py
install : true,
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index a51e3cb3b8d..f1a5e0f7649 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -43,7 +43,7 @@
#include "mesa_interface.h"
#include "gbm_driint.h"
-#include "gbmint.h"
+#include <gbm_backend_abi.h>
#include "loader_dri_helper.h"
#include "kopper_interface.h"
#include "loader.h"
diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h
index 9b324aeaf12..9c7588e5726 100644
--- a/src/gbm/backends/dri/gbm_driint.h
+++ b/src/gbm/backends/dri/gbm_driint.h
@@ -31,7 +31,7 @@
#include <xf86drm.h>
#include <string.h>
#include <sys/mman.h>
-#include "gbmint.h"
+#include <gbm_backend_abi.h>
#include "c11/threads.h"
#include <GL/gl.h> /* mesa_interface needs GL types */
diff --git a/src/gbm/backends/dri/meson.build b/src/gbm/backends/dri/meson.build
index 9b5d13e9db8..84a40656980 100644
--- a/src/gbm/backends/dri/meson.build
+++ b/src/gbm/backends/dri/meson.build
@@ -11,10 +11,10 @@ endif
shared_library(
'dri_gbm',
files('gbm_dri.c', 'gbm_driint.h'),
- include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux],
+ include_directories : [inc_gallium, incs_gbm_dri, inc_loader, inc_st_dri, inc_gallium_aux],
link_args : [ld_args_gc_sections],
link_with : [libloader, libgallium_dri],
- dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig],
+ dependencies : [deps_gbm_dri, dep_dl, dep_gbm, dep_libdrm, idep_mesautil, idep_xmlconfig],
gnu_symbol_visibility : 'hidden',
install : true,
install_dir: join_paths(get_option('libdir'), 'gbm'),
diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index eaed028d049..97e8d5fa044 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -15,10 +15,6 @@ args_gbm = [
]
incs_gbm = [include_directories('main'), inc_loader, inc_gallium]
-if with_dri2
- subdir('backends/dri')
-endif
-
libgbm_name = 'gbm'
if with_platform_android and get_option('platform-sdk-version') >= 30
@@ -43,7 +39,7 @@ if with_tests
test('gbm-abi-check', abi_check, suite : ['gbm'])
endif
-install_headers('main/gbm.h')
+install_headers('main/gbm.h', 'main/gbm_backend_abi.h')
pkg.generate(
name : 'gbm',
@@ -67,3 +63,8 @@ if with_symbols_check
suite : ['gbm'],
)
endif
+
+dep_gbm = declare_dependency(
+ link_with : libgbm,
+ include_directories : inc_gbm,
+)
diff --git a/src/meson.build b/src/meson.build
index d443d2b41bb..74250ed2148 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -127,11 +127,17 @@ endif
if with_glx == 'dri'
subdir('glx')
endif
+
if with_gbm
- subdir('gbm')
+ if get_option('libgbm-external')
+ dep_gbm = dependency('gbm')
+ else
+ subdir('gbm')
+ endif
else
- inc_gbm = []
+ dep_gbm = null_dep
endif
+
if with_egl
subdir('egl')
endif
@@ -141,6 +147,10 @@ if with_gallium and with_gbm
endif
endif
+if with_gbm and with_dri2
+ subdir('gbm/backends/dri')
+endif
+
# This must be after at least mesa, glx, and gallium, since libgl will be
# defined in one of those subdirs depending on the glx provider.
if with_glx != 'disabled' and not with_glvnd
pkgs/development/node-packages/node-env.nix
+6 -7
View File
@@ -540,17 +540,16 @@ let
in
stdenv.mkDerivation (
{
name = name + lib.optionalString (version != null) "-${version}";
strictDeps = true;
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs =
[ tarWrapper ]
[
tarWrapper
python
nodejs
]
++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
propagatedNativeBuildInputs = [
nodejs
python
];
inherit nodejs;
pkgs/development/ocaml-modules/ocaml-vdom/default.nix → pkgs/development/ocaml-modules/vdom/default.nix
+6 -7
View File
@@ -1,6 +1,6 @@
{
lib,
fetchurl,
fetchzip,
buildDunePackage,
js_of_ocaml-compiler,
gen_js_api,
@@ -8,14 +8,13 @@
}:
buildDunePackage rec {
pname = "ocaml-vdom";
version = "0.2";
pname = "vdom";
version = "0.3";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/LexiFi/ocaml-vdom/archive/refs/tags/v${version}.tar.gz";
sha256 = "sha256-FVR0WubW9VJBGVtVaXdJ+O/ghq0w5+BuItFWXkuVYL8=";
src = fetchzip {
url = "https://github.com/LexiFi/ocaml-vdom/archive/refs/tags/${version}.tar.gz";
hash = "sha256-mlXOb+KCdHWNL9PAppan7m7JaP83JEjq+tu14JI+NJo=";
};
nativeBuildInputs = [
pkgs/development/python-modules/boto3-stubs/default.nix
+2 -2
View File
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.38.18";
version = "1.38.19";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-4hn4/Xsx9tHaMWamBMazFWtGZq2OGwj+WCVu2UPzWpE=";
hash = "sha256-Vm1Q7HAQXwb4YEHQP9SvaiQyL0Bj7NL2rIm5szgDjRQ=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/botocore-stubs/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.38.18";
version = "1.38.19";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-lc6Rrf+iFOrV62uq8oHJkmxSsgrZsgjVTzsYM6HuxqQ=";
hash = "sha256-hPZ6QrskCo6gxf5PBdSXzEERd9tgC8cBIYLkmawkvxk=";
};
nativeBuildInputs = [ setuptools ];
pkgs/development/python-modules/diffenator2/default.nix
+2 -2
View File
@@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "diffenator2";
version = "0.4.8";
version = "0.4.9";
pyproject = true;
src = fetchFromGitHub {
owner = "googlefonts";
repo = "diffenator2";
tag = "v${version}";
hash = "sha256-DazI5YxNQIdkzCuC5T3JFwfYBDXbeWnyQgwWdndWMhA=";
hash = "sha256-EV+ju2PnjqRsjQvh/bQJYtDOO4vvisoU0aqlV9vMQp8=";
};
env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
pkgs/development/python-modules/django-auditlog/default.nix
+10 -8
View File
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "django-auditlog";
version = "3.0.0";
version = "3.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-auditlog";
rev = "v${version}";
hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU=";
tag = "v${version}";
hash = "sha256-xb6pTsXkB8HVpXvB9WzBUlRcjh5cn1CdmMYQQVCQ/GU=";
};
nativeBuildInputs = [
@@ -50,22 +50,24 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
cd auditlog_tests
# strip escape codes otherwise tests fail
# see https://github.com/jazzband/django-auditlog/issues/644
TEST_DB_USER=$PGUSER \
TEST_DB_HOST=$PGHOST \
${python.interpreter} runtests.py | cat
${python.interpreter} ./manage.py test | cat
cd ..
runHook postCheck
'';
pythonImportsCheck = [ "auditlog" ];
meta = with lib; {
changelog = "https://github.com/jazzband/django-auditlog/blob/v${version}/CHANGELOG.md";
meta = {
changelog = "https://github.com/jazzband/django-auditlog/blob/${src.tag}/CHANGELOG.md";
description = "Django app that keeps a log of changes made to an object";
downloadPage = "https://github.com/jazzband/django-auditlog";
license = licenses.mit;
maintainers = with maintainers; [ leona ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ leona ];
};
}
pkgs/development/python-modules/django-celery-results/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "django-celery-results";
version = "2.5.1";
version = "2.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "django_celery_results";
inherit version;
hash = "sha256-PstxR/dz800DgbrGJGM3zkz4ii6nuCd07UjlGLZ7uP0=";
hash = "sha256-mrzYNq5rYQY3eSRNiIeoj+gLv6uhQ98208sHA0ZxJ3w=";
};
postPatch = ''
pkgs/development/python-modules/faraday-plugins/default.nix
+3 -3
View File
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.24.0";
version = "1.24.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
tag = version;
hash = "sha256-GADunGRBcVTnzYzBgXQH2IkDXHRSJiPsdeRBEdJJs0s=";
hash = "sha256-CTBEerFfqE9zRTe6l7IDKXOP+WVEPYdNMuMk2PBkkdw=";
};
postPatch = ''
@@ -76,7 +76,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Security tools report parsers for Faraday";
homepage = "https://github.com/infobyte/faraday_plugins";
changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}";
changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${src.tag}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "faraday-plugins";
pkgs/development/python-modules/gehomesdk/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "2025.2.2";
version = "2025.5.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
hash = "sha256-c2WrY/Db2D0x+jDszDkojBKAZmwGNQnXXfSrkoSjs3w=";
hash = "sha256-YMw0W9EWz3KY1+aZMdtE4TRvFd9yqTHkfw0X3+ZDCfQ=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/githubkit/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.12.12";
version = "0.12.13";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
tag = "v${version}";
hash = "sha256-QAEPcSjMJi4BXkc3owM+fRlplOa+IlKdYYzf08iqLOQ=";
hash = "sha256-TMn81YY44bXUyU6GHSGtLtQ7aC2/vA9nZf/PaGhBi0s=";
};
pythonRelaxDeps = [ "hishel" ];
pkgs/development/python-modules/google-cloud-netapp/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-netapp";
version = "0.3.22";
version = "0.3.23";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_netapp";
inherit version;
hash = "sha256-umh9DcaAAW8Naa1+TRdLosICAIQ+71VT3cHR2pl78mk=";
hash = "sha256-PP4o+qHCa3Ok6y9Ehyevmq1ac9Wb2zZoEDQgIpm0sr0=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/google-pasta/default.nix
+11 -4
View File
@@ -2,17 +2,19 @@
lib,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
setuptools,
six,
}:
buildPythonPackage rec {
pname = "google-pasta";
version = "0.2.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9";
hash = "sha256-yfLI38j5bQ1YCCmZIHIb4wye7DfyOJ8okE9FRWXIoW4=";
};
postPatch = ''
@@ -20,12 +22,17 @@ buildPythonPackage rec {
--replace-fail assertRaisesRegexp assertRaisesRegex
'';
propagatedBuildInputs = [ six ];
build-system = [ setuptools ];
dependencies = [ six ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pasta" ];
meta = {
description = "AST-based Python refactoring library";
homepage = "https://github.com/google/pasta";
# Usually the tag message contains a one-line summary of the changes.
changelog = "https://github.com/google/pasta/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ timokau ];
pkgs/development/python-modules/gotenberg-client/default.nix
+3 -3
View File
@@ -9,7 +9,7 @@
}:
buildPythonPackage rec {
pname = "gotenberg-client";
version = "0.9.0";
version = "0.10.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "stumpylog";
repo = "gotenberg-client";
tag = version;
hash = "sha256-4tIkwfqFKERVQMB9nGwGfdMtxCWm3q4hrSWnEqA0qd8=";
hash = "sha256-eDYgKbNeNCIdENo6DVmcABRwP5JUMCJW7NtbPOA5aqg=";
};
nativeBuildInputs = [ hatchling ];
@@ -35,7 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python client for interfacing with the Gotenberg API";
homepage = "https://github.com/stumpylog/gotenberg-client";
changelog = "https://github.com/stumpylog/gotenberg-client/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/stumpylog/gotenberg-client/blob/${src.tag}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [ leona ];
};
pkgs/development/python-modules/llama-cloud/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-cloud";
version = "0.1.21";
version = "0.1.22";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_cloud";
inherit version;
hash = "sha256-VnbVTkZQ0pNpH1ztFZfXTUibM/1B9R1nez/TX1bfaT4=";
hash = "sha256-XZOCc2ktpQ9zMBqt/tG0sQ+U3767nx4THAMeAz67Kn8=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@
}:
buildPythonPackage rec {
pname = "mkdocs-awesome-nav";
version = "3.1.1";
version = "3.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "lukasgeiter";
repo = "mkdocs-awesome-nav";
tag = "v${version}";
hash = "sha256-K7W8RHLzVx3wvLPjDEHLhednxViWWfez/w1tbDfcvrA=";
hash = "sha256-F52LG5kdrZvQbVhV++0SwRYKLg6kgBY4ycomfr/bG/0=";
};
build-system = [ flit-core ];
pkgs/development/python-modules/mypy-boto3/default.nix
+4 -4
View File
@@ -446,8 +446,8 @@ rec {
"sha256-RQh46jrXqj4bXTRJ+tPR9sql7yUn7Ek9u4p0OU0A7b0=";
mypy-boto3-ec2 =
buildMypyBoto3Package "ec2" "1.38.14"
"sha256-+EI+0aGCa21XL3qoAr821F/j8dJTCaLcVRKP743szUQ=";
buildMypyBoto3Package "ec2" "1.38.19"
"sha256-FonE4x7zpgXEgLAtwv2qJ1I//IRUHSvSvvCLmy8CF1Y=";
mypy-boto3-ec2-instance-connect =
buildMypyBoto3Package "ec2-instance-connect" "1.38.0"
@@ -878,8 +878,8 @@ rec {
"sha256-QKKwwaJJ7o/FEWPQpLT7yMapG5DR6bn3UTt5XcMlN9A=";
mypy-boto3-mediapackagev2 =
buildMypyBoto3Package "mediapackagev2" "1.38.0"
"sha256-f+MhMUbwcntEUONIzYIFCcJQgvNGeDZqhPbA4HJkVU8=";
buildMypyBoto3Package "mediapackagev2" "1.38.19"
"sha256-XgeZlI03x32rfCt02ozAxWLOe6CBV+6qzgKhxkC6pc8=";
mypy-boto3-mediastore =
buildMypyBoto3Package "mediastore" "1.38.0"
pkgs/development/python-modules/oslo-config/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "oslo-config";
version = "9.7.1";
version = "9.8.0";
pyproject = true;
src = fetchPypi {
pname = "oslo_config";
inherit version;
hash = "sha256-VVizS8wrUvIgjoD8rZVaT3ssQbskW2RR1DpiGtEmO70=";
hash = "sha256-7qgAlQSr7mchN8WL2r2roYX0lrk8ha3SRuLNzr6dCKo=";
};
postPatch = ''
pkgs/development/python-modules/proglog/default.nix
+7 -4
View File
@@ -2,20 +2,23 @@
lib,
fetchPypi,
buildPythonPackage,
setuptools,
tqdm,
}:
buildPythonPackage rec {
pname = "proglog";
version = "0.1.10";
format = "setuptools";
version = "0.1.12";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-ZYwoycguTK6y8l9Ij/+c6s4i+NabFdDByG1kJ15N2rQ=";
hash = "sha256-Nh7gdHIcJ3uJt1wGEzbLjF8ofJKwQ++lYsz3hmzakxw=";
};
propagatedBuildInputs = [ tqdm ];
build-system = [ setuptools ];
dependencies = [ tqdm ];
meta = with lib; {
description = "Logs and progress bars manager for Python";
pkgs/development/python-modules/pyghmi/default.nix
+2 -2
View File
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "pyghmi";
version = "1.6.0";
version = "1.6.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-jPfGPKQkHLyapGWJ0o05e79pPlw0UWNJeHHJgb+MdFQ=";
hash = "sha256-XS0QQhHLkld9swn4WYj6nnMkMO6BZZ5iG0oJgFOCC9k=";
};
build-system = [
pkgs/development/python-modules/pymc/default.nix
+4
View File
@@ -37,6 +37,10 @@ buildPythonPackage rec {
versioneer
];
pythonRelaxDeps = [
"pytensor"
];
dependencies = [
arviz
cachetools
pkgs/development/python-modules/pytensor/default.nix
+2 -2
View File
@@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "pytensor";
version = "2.30.3";
version = "2.31.0";
pyproject = true;
src = fetchFromGitHub {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
postFetch = ''
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
'';
hash = "sha256-Iyiuvt86pfz8MmpwgDecKJFVOw+fKpEaA9m1MBA9Yxs=";
hash = "sha256-RgJeKA0dRSY1xn+7pgzUg5Hn5KKAWUilimbZOn43xHQ=";
};
build-system = [
pkgs/development/python-modules/python-efl/default.nix
+43 -13
View File
@@ -2,11 +2,19 @@
lib,
fetchurl,
buildPythonPackage,
pythonAtLeast,
pkg-config,
python,
dbus-python,
packaging,
enlightenment,
packaging,
setuptools,
dbus-python,
pytestCheckHook,
directoryListingUpdater,
}:
@@ -15,10 +23,13 @@
buildPythonPackage rec {
pname = "python-efl";
version = "1.26.1";
format = "setuptools";
pyproject = true;
# As of 1.26.1, native extensions fail to build with python 3.13+
disabled = pythonAtLeast "3.13";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
url = "http://download.enlightenment.org/rel/bindings/python/python-efl-${version}.tar.xz";
hash = "sha256-3Ns5fhIHihnpDYDnxvPP00WIZL/o1UWLzgNott4GKNc=";
};
@@ -26,24 +37,43 @@ buildPythonPackage rec {
buildInputs = [ enlightenment.efl ];
propagatedBuildInputs = [
dbus-python
build-system = [
packaging
setuptools
];
dependencies = [
dbus-python
];
preConfigure = ''
NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE"
'';
preBuild = ''
${python.pythonOnBuildForHost.interpreter} setup.py build_ext
nativeCheckInputs = [
pytestCheckHook
];
preCheck = ''
# make sure we load the library from $out instead of the cwd
# because cwd doesn't contain the built extensions
rm -r efl/
patchShebangs tests/ecore/exe_helper.sh
# use the new name instead of the removed alias
substituteInPlace tests/evas/test_01_rect.py \
--replace-fail ".assert_(" ".assertTrue("
'';
installPhase = ''
${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out --single-version-externally-managed
'';
pytestFlagsArray = [ "tests/" ];
doCheck = false;
disabledTestPaths = [
"tests/dbus/test_01_basics.py" # needs dbus daemon
"tests/ecore/test_09_file_download.py" # uses network
"tests/ecore/test_11_con.py" # uses network
"tests/elementary/test_02_image_icon.py" # RuntimeWarning: Setting standard icon failed
];
passthru.updateScript = directoryListingUpdater { };
pkgs/development/python-modules/python-engineio/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-engineio";
version = "4.12.0";
version = "4.12.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "miguelgrinberg";
repo = "python-engineio";
tag = "v${version}";
hash = "sha256-PeVQT1gT2XAPJgR7EDPmN1j2p9hDrwF0LWbqVtgkZ7M=";
hash = "sha256-slSLTcnrDGCI2hUbttp14qbNhiVFJ+PMZlhAq4ISDBs=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/python-manilaclient/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "python-manilaclient";
version = "5.4.0";
version = "5.5.0";
pyproject = true;
src = fetchPypi {
pname = "python_manilaclient";
inherit version;
hash = "sha256-58AYZzpFwG4Vd2AXW1WYxzbKRtMri7cyY7kboqv9EN8=";
hash = "sha256-wPYVZ0+a9g+IP3l3eH9gMWXfe5VGUzem7qWEOWZ+vlo=";
};
build-system = [
pkgs/development/python-modules/spacy/default.nix
+2 -2
View File
@@ -47,14 +47,14 @@
buildPythonPackage rec {
pname = "spacy";
version = "3.8.5";
version = "3.8.6";
pyproject = true;
src = fetchFromGitHub {
owner = "explosion";
repo = "spaCy";
tag = "release-v${version}";
hash = "sha256-rgMstGSscUBACA5+veXD9H/lHuvWKs7hJ6hz6aKOB/0=";
hash = "sha256-Zy2RLib/B9fLtcqO24ltvn1PUD68l9Rf7nHH4XuT6to=";
};
build-system = [
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1381";
version = "3.0.1383";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
hash = "sha256-qxdQZnptPh5y0Hk0Zron2LvggdHWpVgjVW75+pe7iWU=";
hash = "sha256-xC16Y4fLEvGgMnZGx2KV/a3HTIrXwPSwxlQwDzB52fo=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/types-tqdm/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "types-tqdm";
version = "4.67.0.20250417";
version = "4.67.0.20250516";
pyproject = true;
src = fetchPypi {
pname = "types_tqdm";
inherit version;
hash = "sha256-v8xAmdjUjfVOU/PqZHCMvMHRxAOcp2GVlBidqMA8e+I=";
hash = "sha256-IwzKuKMy008ZP8AH6xMqbvVLRRJFLnGL8hrgp8rrWms=";
};
build-system = [ setuptools ];
pkgs/development/tools/misc/yakut/default.nix
+2 -2
View File
@@ -18,12 +18,12 @@
buildPythonApplication rec {
pname = "yakut";
version = "0.13.0";
version = "0.14.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-MBVSt01D36rBPW2bopujyu8Opwwavmm7S3tdaWp5ACw=";
hash = "sha256-58SYSbKJWFgxm8QAaLPIDfVowV+NEh2nMEDrwSSBDbI=";
};
buildInputs = [
pkgs/development/tools/pnpm/fetch-deps/default.nix
+3 -2
View File
@@ -11,7 +11,7 @@
}:
{
fetchDeps =
fetchDeps = lib.makeOverridable (
{
hash ? "",
pname,
@@ -120,7 +120,8 @@
}
// hash'
)
);
)
);
configHook = makeSetupHook {
name = "pnpm-config-hook";
pkgs/os-specific/linux/msi-ec/default.nix
+7 -4
View File
@@ -9,18 +9,21 @@
}:
stdenv.mkDerivation {
pname = "msi-ec-kmods";
version = "0-unstable-2024-11-04";
version = "0-unstable-2025-05-17";
src = fetchFromGitHub {
owner = "BeardOverflow";
repo = "msi-ec";
rev = "be6f7156cd15f6ecf9d48dfcc30cbd1f693916b8";
hash = "sha256-gImiP4OaBt80n+qgVnbhd0aS/zW+05o3DzGCw0jq+0g=";
rev = "796be9047b13c311ac4cdec33913775f4057f600";
hash = "sha256-npJbnWFBVb8TK9ynVD/kXWq2iqO0ACKF4UYsu5mQuok=";
};
dontMakeSourcesWritable = false;
patches = [ ./patches/makefile.patch ];
patches = [
./patches/makefile.patch
./patches/kernel-string-choices.patch
];
hardeningDisable = [ "pic" ];
pkgs/os-specific/linux/msi-ec/patches/kernel-string-choices.patch
+37
View File
@@ -0,0 +1,37 @@
--- a/msi-ec.c
+++ b/msi-ec.c
@@ -38,7 +38,12 @@
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/rtc.h>
-#include <linux/string_choices.h>
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0)
+#include <linux/string_choices.h>
+#endif
+
static DEFINE_MUTEX(ec_set_by_mask_mutex);
static DEFINE_MUTEX(ec_unset_by_mask_mutex);
@@ -1141,6 +1146,20 @@ static struct msi_ec_conf CONF52 __initdata = {
},
};
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+/* Define our own string choice helpers for older kernels */
+static inline const char *str_on_off(bool v)
+{
+ return v ? "on" : "off";
+}
+
+static inline const char *str_yes_no(bool v)
+{
+ return v ? "yes" : "no";
+}
+#endif
+
+
static struct msi_ec_conf *CONFIGURATIONS[] __initdata = {
&CONF0,
&CONF1,
pkgs/servers/authelia/sources.nix
+4 -4
View File
@@ -1,14 +1,14 @@
{ fetchFromGitHub }:
rec {
pname = "authelia";
version = "4.39.1";
version = "4.39.3";
src = fetchFromGitHub {
owner = "authelia";
repo = "authelia";
rev = "v${version}";
hash = "sha256-Q/NGjJphuZ7MMnOSTAukzEg4iAQWc/VDFWs0jj4e0dY=";
hash = "sha256-HBkHN7c8O07b2ZI6R7KFvdBF5GWuYU6rmisxLMSH5EQ=";
};
vendorHash = "sha256-FE4YABsWKhifVjdzJSnjWPesjuSe/hWDa6oTg8MZjo8=";
pnpmDepsHash = "sha256-TJ/Uz7Q+mXfvZ/Zu12Pv1O8LKTzEPJ+Pa+3vrKghPks=";
vendorHash = "sha256-2wJvX6jAjU9iaFMIcC5Qm1agRMPv4fFfsCeTkvXSpYs=";
pnpmDepsHash = "sha256-uy6uKfZpsFEl2n6zOriRsKwlw3av1f0xBF/CwhWLJMU=";
}
pkgs/top-level/ocaml-packages.nix
+3 -1
View File
@@ -1467,7 +1467,7 @@ let
ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { };
ocaml-vdom = callPackage ../development/ocaml-modules/ocaml-vdom { };
ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
ocamlbuild =
if lib.versionOlder "4.03" ocaml.version then
@@ -2122,6 +2122,8 @@ let
vchan = callPackage ../development/ocaml-modules/vchan { };
vdom = callPackage ../development/ocaml-modules/vdom { };
vector = callPackage ../development/ocaml-modules/vector { };
vg = callPackage ../development/ocaml-modules/vg { };