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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-11-10 11:04:22 +00:00
committed by GitHub
parent 4b06c7e4a5 79b9a72311
commit 2803f914a0
51 changed files with 439 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/common/acme/server/generate-certs.nix
+1 -4
View File
@@ -4,11 +4,8 @@
pkgs ? import <nixpkgs> { },
minica ? pkgs.minica,
mkDerivation ? pkgs.stdenv.mkDerivation,
domain ? (import ./snakeoil-certs.nix).domain,
}:
let
conf = import ./snakeoil-certs.nix;
domain = conf.domain;
in
mkDerivation {
name = "test-certs";
buildInputs = [
nixos/tests/redlib.nix
+22
View File
@@ -1,4 +1,8 @@
{ lib, pkgs, ... }:
let
certs = import redlib/snakeoil-certs.nix;
redditDomain = certs.domain;
in
{
name = "redlib";
meta.maintainers = with lib.maintainers; [
@@ -7,6 +11,24 @@
];
nodes.machine = {
# The test will hang if Redlib can't initialize its OAuth client, so we
# provide it with a mock endpoint.
networking.hosts."127.0.0.1" = [ redditDomain ];
security.pki.certificates = [
(builtins.readFile certs.ca.cert)
];
services.nginx = {
enable = true;
virtualHosts.${redditDomain} = {
onlySSL = true;
sslCertificate = certs.${redditDomain}.cert;
sslCertificateKey = certs.${redditDomain}.key;
locations."/auth/v2/oauth/access-token/loid".extraConfig = ''
return 200 "{\"access_token\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\",\"expires_in\":0}";
'';
};
};
services.redlib = {
package = pkgs.redlib;
enable = true;
nixos/tests/redlib/ca.cert.pem
+13
View File
@@ -0,0 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB/TCCAYKgAwIBAgIIR+NCHSDJCIAwCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV
bWluaWNhIHJvb3QgY2EgNDdlMzQyMCAXDTI1MTEwOTA2MjMwNFoYDzIxMjUxMTA5
MDYyMzA0WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA0N2UzNDIwdjAQBgcq
hkjOPQIBBgUrgQQAIgNiAASo81ED5tomfR47qFXpan+0cBKP7eoAhAAkJeT9w/h2
axpVVQ/X+rDFu1QbKDqE7lJ2j3Ue7eb/6Q5Zrt9MSFPDcQz7eFr6kX0S2u5AHO9z
6E60gUNUwZBDBenr0P/uTQ6jgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQW
MBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1Ud
DgQWBBQuPLVPdRiEUCga2W3RKwL4diQVMDAfBgNVHSMEGDAWgBQuPLVPdRiEUCga
2W3RKwL4diQVMDAKBggqhkjOPQQDAwNpADBmAjEAqG8PIYJ0CQG3CfLsQFpwDLmj
DoEFgcRMkRQz4vtAQMpLhoo8VAPo7Vl+AAaZgRVPAjEA6XDte56Oou5qMj4Zkzi8
EYIucHtYrfTNJOarDSYYvTlNrmuQ73KTP4Hxfd26TA2q
-----END CERTIFICATE-----
nixos/tests/redlib/ca.key.pem
+6
View File
@@ -0,0 +1,6 @@
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBuuWbxl4uwwcIT0SvT
jcQHDekytbQrLw4imrpfrAJmTdvyHcfEGiWuwscs36mq50WhZANiAASo81ED5tom
fR47qFXpan+0cBKP7eoAhAAkJeT9w/h2axpVVQ/X+rDFu1QbKDqE7lJ2j3Ue7eb/
6Q5Zrt9MSFPDcQz7eFr6kX0S2u5AHO9z6E60gUNUwZBDBenr0P/uTQ4=
-----END PRIVATE KEY-----
nixos/tests/redlib/snakeoil-certs.nix
+17
View File
@@ -0,0 +1,17 @@
# To generate cert files:
# cp $(nix-build ../common/acme/server/generate-certs.nix --arg domain '(import ./snakeoil-certs.nix).domain' --no-out-link)/* .
let
domain = "www.reddit.com";
in
{
inherit domain;
ca = {
cert = ./ca.cert.pem;
key = ./ca.key.pem;
};
${domain} = {
cert = ./${domain}.cert.pem;
key = ./${domain}.key.pem;
};
}
nixos/tests/redlib/www.reddit.com.cert.pem
+13
View File
@@ -0,0 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB5jCCAW2gAwIBAgIIFaN6FT3RbaswCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV
bWluaWNhIHJvb3QgY2EgNDdlMzQyMB4XDTI1MTEwOTA2MjMwNFoXDTQ1MTEwOTA2
MjMwNFowGTEXMBUGA1UEAxMOd3d3LnJlZGRpdC5jb20wdjAQBgcqhkjOPQIBBgUr
gQQAIgNiAAQpU1quYyW3g2ZjtwSFLNOhucqkjFhCN5rcSZOLpbnieelZ6axvoH6x
2Znfcu4YqYtK8G/zHDv2o9gQQpDBcWp7dobpUVbfrSRxsr5LEYlEXPUslbFkFWau
HzKTx5QTyu2jezB5MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBQuPLVPdRiEUCga
2W3RKwL4diQVMDAZBgNVHREEEjAQgg53d3cucmVkZGl0LmNvbTAKBggqhkjOPQQD
AwNnADBkAjAqU0nW3KRXEZMTP9qjnNqherjVYa8WPWMCtwYqiFDOWilByZFjEZUs
8it+unxaNe4CMA12fOFHgsM1tKRiSslIHXSx5V71RkXGrQxxqfRlD0w7LjsJWXRv
Z6DKyxfF6MJPEA==
-----END CERTIFICATE-----
nixos/tests/redlib/www.reddit.com.key.pem
+6
View File
@@ -0,0 +1,6 @@
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDB1r7aQH0yOtCYquZXn
1jVqo9gD7kIZRa4TaeHNRRKcv9w9WswTfSJ/0QILIFP0K7WhZANiAAQpU1quYyW3
g2ZjtwSFLNOhucqkjFhCN5rcSZOLpbnieelZ6axvoH6x2Znfcu4YqYtK8G/zHDv2
o9gQQpDBcWp7dobpUVbfrSRxsr5LEYlEXPUslbFkFWauHzKTx5QTyu0=
-----END PRIVATE KEY-----
pkgs/applications/video/obs-studio/default.nix
+27 -12
View File
@@ -7,6 +7,7 @@
nv-codec-headers-12,
fetchFromGitHub,
fetchpatch2,
fetchurl,
addDriverRunpath,
autoAddDriverRunpath,
cudaSupport ? config.cudaSupport,
@@ -68,19 +69,33 @@
let
inherit (lib) optional optionals;
cef = cef-binary.overrideAttrs (oldAttrs: {
version = "138.0.17";
__intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
gitRevision = "ac9b751";
chromiumVersion = "138.0.7204.97";
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
srcHash =
{
aarch64-linux = "sha256-kdO7c9oUfv0HK8wTmvYzw9S6EapnSGEQNCGN9D1JSL0=";
x86_64-linux = "sha256-3qgIhen6l/kxttyw0z78nmwox62riVhlmFSGPkUot7g=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
});
cef = cef-binary.overrideAttrs (
oldAttrs:
let
version = "6533";
revision = "6";
in
{
inherit version;
src = fetchurl {
url = "https://cdn-fastly.obsproject.com/downloads/cef_binary_${version}_linux_${
selectSystem {
aarch64-linux = "aarch64";
x86_64-linux = "x86_64";
}
}_v${revision}.tar.xz";
hash = selectSystem {
aarch64-linux = "sha256-ZCUURp6qKaXIh4kQhNLnP33C10Bfffp3JrLbwkswmZk=";
x86_64-linux = "sha256-eWMzVRmhnM3FIz9zNMWrAjAm4vPpoMxBcAfAnYZggUY=";
};
};
}
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio";
pkgs/by-name/au/autotools-language-server/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "autotools-language-server";
version = "0.0.22";
version = "0.0.23";
pyproject = true;
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = "autotools-language-server";
tag = version;
hash = "sha256-PvaEcdvUE8QpxKuW65RL8SgDl/RM/C3HTEK3v+YA73c=";
hash = "sha256-cehiqxst3iGpR2UnkpN7wVAxd924n0ZNek3aiwEW+ZA=";
};
build-system = [
pkgs/by-name/bo/bolt-launcher/package.nix
+6 -9
View File
@@ -23,19 +23,16 @@
enableRS3 ? false,
}:
let
cef = cef-binary.overrideAttrs (oldAttrs: {
cef = cef-binary.override {
version = "126.2.18";
__intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
gitRevision = "3647d39";
chromiumVersion = "126.0.6478.183";
srcHash =
{
aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao=";
x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
});
srcHashes = {
aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao=";
x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc=";
};
};
in
let
bolt = stdenv.mkDerivation (finalAttrs: {
pkgs/by-name/ce/cef-binary/package.nix
+107 -4
View File
@@ -1,15 +1,118 @@
{
libcef,
lib,
stdenv,
fetchurl,
glib,
nss,
nspr,
atk,
at-spi2-atk,
libdrm,
expat,
libxkbcommon,
libgbm,
gtk3,
pango,
cairo,
alsa-lib,
dbus,
at-spi2-core,
cups,
libGL,
udev,
systemdLibs,
xorg,
version ? "141.0.7",
gitRevision ? "a5714cc",
chromiumVersion ? "141.0.7390.108",
buildType ? "Release",
srcHashes ? {
aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE=";
x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk=";
},
}:
libcef.overrideAttrs (oldAttrs: {
let
gl_rpath = lib.makeLibraryPath [ stdenv.cc.cc ];
rpath = lib.makeLibraryPath [
glib
nss
nspr
atk
at-spi2-atk
libdrm
expat
libxkbcommon
libgbm
gtk3
pango
cairo
alsa-lib
dbus
at-spi2-core
cups
libGL
udev
systemdLibs
xorg.libxcb
xorg.libX11
xorg.libXcomposite
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXrandr
xorg.libxshmfence
];
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation {
pname = "cef-binary";
inherit version;
src = fetchurl {
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${
selectSystem {
aarch64-linux = "linuxarm64";
x86_64-linux = "linux64";
}
}_minimal.tar.bz2";
hash = selectSystem srcHashes;
};
dontStrip = true;
dontPatchELF = true;
installPhase = ''
runHook preInstall
cp -r .. $out
sed 's/-O0/-O2/' -i cmake/cef_variables.cmake
patchelf --set-rpath "${rpath}" --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${buildType}/chrome-sandbox
patchelf --add-needed libudev.so --set-rpath "${rpath}" ${buildType}/libcef.so
patchelf --set-rpath "${gl_rpath}" ${buildType}/libEGL.so
patchelf --add-needed libGL.so.1 --set-rpath "${gl_rpath}" ${buildType}/libGLESv2.so
patchelf --set-rpath "${gl_rpath}" ${buildType}/libvk_swiftshader.so
patchelf --set-rpath "${gl_rpath}" ${buildType}/libvulkan.so.1
cp --recursive . $out
runHook postInstall
'';
})
passthru = {
inherit buildType;
updateScript = ./update.sh;
};
meta = {
description = "Simple framework for embedding Chromium-based browsers in other applications";
homepage = "https://cef-builds.spotifycdn.com/index.html";
maintainers = with lib.maintainers; [ puffnfresh ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.bsd3;
platforms = builtins.attrNames srcHashes;
};
}
pkgs/development/libraries/libcef/update.sh → pkgs/by-name/ce/cef-binary/update.sh
+3 -3
View File
@@ -3,7 +3,7 @@
set -euo pipefail
current_version=$(nix-instantiate --eval -E "with import ./. {}; libcef.version or (lib.getVersion libcef)" | tr -d '"')
current_version=$(nix-instantiate --eval -E "with import ./. {}; cef-binary or (lib.getVersion cef-binary)" | tr -d '"')
ROOT="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
@@ -23,7 +23,7 @@ fi
update_nix_value() {
local key="$1"
local value="${2:-}"
sed -i "s|$key = \".*\"|$key = \"$value\"|" $ROOT/default.nix
sed -i "s|$key ? \".*\"|$key ? \"$value\"|" $ROOT/package.nix
}
update_nix_value version "$cef_version"
@@ -39,5 +39,5 @@ for platform in "${platforms[@]}"; do
read -r system arch <<< "$platform"
url="https://cef-builds.spotifycdn.com/cef_binary_${cef_version}+g${git_revision}+chromium-${chromium_version}_linux${arch}_minimal.tar.bz2"
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")")
update-source-version libcef "$cef_version" "$hash" --system="$system" --ignore-same-version
update-source-version cef-binary "$cef_version" "$hash" --system="$system" --ignore-same-version
done
pkgs/by-name/ch/chicago95/package.nix
+6
View File
@@ -18,6 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [ gtk3 ];
buildPhase = ''
runHook preBuild
find . -xtype l -delete
runHook postBuild
'';
installPhase = ''
runHook preInstall
pkgs/by-name/cn/cnspec/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "12.7.1";
version = "12.8.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-IriF6vr2Kw7h44zFd7hMhybseqtlYepjfQl+Z54fdbQ=";
hash = "sha256-9vGqElva4sS0uV2Be1WV9dW2bLYNOFZRB3wF3rSassM=";
};
proxyVendor = true;
vendorHash = "sha256-P0spAsBp3jv0Nn4gVYTd+5WbWQgGZ83fyzxT3i0ncHs=";
vendorHash = "sha256-aEiHnYEJGg+kTUN2k9GKUtSaNpdQio5OsEJ8EnbxPLk=";
subPackages = [ "apps/cnspec" ];
pkgs/by-name/co/codex/package.nix
+3 -3
View File
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.56.0";
version = "0.57.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-CIKoOfqZwCCCDFXnRdU7haxfiyvrgGD3vSwXZpE9DUU=";
hash = "sha256-Mjn2SesclOTBLiE7hQRtdyI/TpIM5lw2uswYyCMhyGY=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-FN20afqRVdGl17+fbzNoXqF8BY+dPtGi1lvwB6w+ieE=";
cargoHash = "sha256-ijXcYBMP63VzeHqVTEebJ83cYQtQgHU62kWklA1NHEA=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/cr/cryptpad/package.nix
+71 -21
View File
@@ -14,22 +14,60 @@
}:
let
version = "2025.3.0";
version = "2025.6.0";
# nix version of install-onlyoffice.sh
# a later version could rebuild from sdkjs/web-apps as per
# https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh
onlyoffice_build =
rev: hash:
fetchFromGitHub {
inherit rev hash;
owner = "cryptpad";
repo = "onlyoffice-builds";
};
onlyoffice_fetch =
{
rev ? null,
version ? null,
hash,
...
}:
assert (
lib.assertMsg (lib.xor (rev == null) (
version == null
)) "onlyoffice_fetch requires one of either `rev` or `version` to be provided (not both)."
);
if rev != null then
fetchFromGitHub {
inherit rev hash;
owner = "cryptpad";
repo = "onlyoffice-builds";
}
# New method for v7+ versions that use ZIP releases
else
fetchurl {
url = "https://github.com/cryptpad/onlyoffice-editor/releases/download/${version}/onlyoffice-editor.zip";
inherit hash;
};
onlyoffice_install = oo: ''
oo_dir="$out_cryptpad/www/common/onlyoffice/dist/${oo.subdir}"
cp -a "${onlyoffice_build oo.rev oo.hash}/." "$oo_dir"
chmod -R +w "$oo_dir"
echo "${oo.rev}" > "$oo_dir/.commit"
${
if oo ? "version" then
''
mkdir -p "$oo_dir"
unzip ${onlyoffice_fetch oo} -d "$oo_dir"
echo "${oo.version}" > "$oo_dir/.version"
# Clean up help files and dictionaries as per upstream
${lib.optionalString (oo.subdir == "v7") ''
rm -rf "$oo_dir"/web-apps/apps/*/main/resources/help
rm -rf "$oo_dir"/dictionaries/
''}
''
else
''
cp -a "${onlyoffice_fetch oo}/." "$oo_dir"
chmod -R +w "$oo_dir"
echo "${oo.rev}" > "$oo_dir/.commit"
# Clean up help files as per upstream
rm -rf "$oo_dir"/web-apps/apps/*/main/resources/help
''
}
'';
onlyoffice_versions = [
{
@@ -59,8 +97,13 @@ let
}
{
subdir = "v7";
rev = "e1267803";
hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0=";
version = "v7.3.3.60+11";
hash = "sha256-He8RwsaJPBhaxFklA7vSxxNUpmcM41lW859gQUUJWbQ=";
}
{
subdir = "v8";
version = "v8.3.3.23+4";
hash = "sha256-DeK84fa7Jc1L1+vF8LBKLXM5oWS0SV2qBnAWG3Xzu4U=";
}
];
@@ -83,11 +126,11 @@ buildNpmPackage {
src = fetchFromGitHub {
owner = "cryptpad";
repo = "cryptpad";
rev = version;
hash = "sha256-NxkVMsfLzdzifdn+f0C6mBJGd1oLwcMTAIXv+gBG7rI=";
tag = version;
hash = "sha256-R8Oonrnb1tqvl1zTkWv5Xv/f8bFtUljD6X/re72IvsU=";
};
npmDepsHash = "sha256-GWkyRlizPSA72WwoY+mRLwaMeD/SXdo6oUVwsd2gp7c=";
npmDepsHash = "sha256-4Zr+8ANZJ9XX2umY/SY7BrEHPheVelFSeZipgOaW6bI==";
nativeBuildInputs = [
makeBinaryWrapper
@@ -120,8 +163,13 @@ buildNpmPackage {
# Move to install directory manually.
npm run install:components
mv www/components "$out_cryptpad/www/"
# and fix absolute symlink to /build...
ln -Tfs ../../src/tweetnacl "$out_cryptpad/www/components/tweetnacl"
# optimization: replace copies with symlinks...
for d in "$out_cryptpad/www/components/"*; do
d="''${d##*/}"
[ -e "$out_cryptpad/node_modules/$d" ] || continue
rm -rf "$out_cryptpad/www/components/$d"
ln -Tfs "../../node_modules/$d" "$out_cryptpad/www/components/$d"
done
# install OnlyOffice (install-onlyoffice.sh without network)
mkdir -p "$out_cryptpad/www/common/onlyoffice/dist"
@@ -130,8 +178,10 @@ buildNpmPackage {
# Run upstream's `install-onlyoffice.sh` script in `--check` mode to
# verify that we've installed the correct versions of the various
# OnlyOffice components.
patchShebangs --build $out_cryptpad/install-onlyoffice.sh
$out_cryptpad/install-onlyoffice.sh --accept-license --check --rdfind
# TODO: Patch the new install method to only verify versions;
# patchShebangs --build $out_cryptpad/install-onlyoffice.sh
# $out_cryptpad/install-onlyoffice.sh --accept-license --check --rdfind
# cryptpad assumes it runs in the source directory and also outputs
# its state files there, which is not exactly great for us.
@@ -144,7 +194,7 @@ buildNpmPackage {
# directory.
makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \
--add-flags "$out_cryptpad/server.js" \
--run "for d in customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \
--run "for d in src customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \
--run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi"
'';
pkgs/by-name/du/duckstation/package.nix
+3 -3
View File
@@ -64,13 +64,13 @@ let
linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "duckstation";
version = "0.1-9787-unstable-2025-10-13";
version = pkgSources.duckstation.version;
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
rev = "8f0c9dd171210dfd7f06223a393e2565abbaabf3";
hash = "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I=";
tag = "v${finalAttrs.version}";
hash = pkgSources.duckstation.hash_linux;
};
# TODO: Remove once this is fixed upstream.
pkgs/by-name/du/duckstation/sources.json
+3 -3
View File
@@ -1,8 +1,8 @@
{
"duckstation": {
"version": "0.1-9669",
"hash_linux": "sha256-Q3vU4PaHMHzA8MTxLQbR++ND4L0iRMw6M7J74jyWBKI=",
"hash_darwin": "sha256-qbY1xKqjYAoxU5EWSFRq8Quu3bZBHHsS8nqnLW3xT+k="
"version": "0.1-9903",
"hash_linux": "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I=",
"hash_darwin": "sha256-7gVpINajfRRDLYBQMQBQtBELosvROiQzTEa2zZbtK44="
},
"discord_rpc": {
"rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92",
pkgs/by-name/du/duckstation/update.sh
+2 -2
View File
@@ -23,13 +23,13 @@ duckstation_storepath=$(nix --extra-experimental-features "nix-command flakes" f
pinned_versions=$duckstation_storepath/scripts/deps/versions
echo "Using pinned discord_rpc..."
discord_rpc_rev=$(grep "DISCORD_RPC=" "$pinned_versions" | sed 's|.*=||g')
discord_rpc_rev=$(grep "DISCORD_RPC_COMMIT=" "$pinned_versions" | sed 's|.*=||g')
discord_rpc_hash=$(nix --extra-experimental-features "nix-command flakes" \
flake prefetch github:stenzek/discord-rpc/"$discord_rpc_rev" --json |
jq -r '.hash')
echo "Using pinned shaderc..."
shaderc_rev=$(grep "SHADERC=" "$pinned_versions" | sed 's|.*=||g')
shaderc_rev=$(grep "SHADERC_COMMIT=" "$pinned_versions" | sed 's|.*=||g')
shaderc_hash=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/shaderc/"$shaderc_rev" --json | jq -r '.hash')
echo "Fetching latest chtdb commit..."
pkgs/tools/security/ggshield/default.nix → pkgs/by-name/gg/ggshield/package.nix
+9 -8
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ggshield";
version = "1.40.0";
version = "1.44.1";
pyproject = true;
src = fetchFromGitHub {
owner = "GitGuardian";
repo = "ggshield";
tag = "v${version}";
hash = "sha256-Y42MBRyjPljUAGTwhH2FS8drUAceuJse8Qd1GbctWQs=";
hash = "sha256-PHCrUzZmpjZMAfKinBYahhwQFjByaIQ/2udSqoGMmdU=";
};
pythonRelaxDeps = true;
@@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec {
build-system = with python3.pkgs; [ pdm-backend ];
dependencies = with python3.pkgs; [
appdirs
charset-normalizer
click
cryptography
@@ -37,6 +36,8 @@ python3.pkgs.buildPythonApplication rec {
requests
rich
truststore
typing-extensions
urllib3
];
nativeCheckInputs = [
@@ -49,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
pytest-mock
pytest-voluptuous
pytestCheckHook
snapshottest
syrupy
vcrpy
]);
@@ -80,12 +81,12 @@ python3.pkgs.buildPythonApplication rec {
"test_get_file_sha_in_ref"
];
meta = with lib; {
meta = {
description = "Tool to find and fix various types of hardcoded secrets and infrastructure-as-code misconfigurations";
homepage = "https://github.com/GitGuardian/ggshield";
changelog = "https://github.com/GitGuardian/ggshield/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
changelog = "https://github.com/GitGuardian/ggshield/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "ggshield";
};
}
pkgs/by-name/li/linux-wallpaperengine/package.nix
+6 -10
View File
@@ -38,19 +38,16 @@
}:
let
cef = cef-binary.overrideAttrs (oldAttrs: {
cef = cef-binary.override {
version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
__intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
gitRevision = "cbc1c5b";
chromiumVersion = "135.0.7049.52";
srcHash =
{
aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs=";
x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
});
srcHashes = {
aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs=";
x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY=";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "linux-wallpaperengine";
@@ -102,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=${cef.buildType}"
"-DCEF_ROOT=${cef}"
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/linux-wallpaperengine"
];
pkgs/by-name/md/mdfried/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mdfried";
version = "0.13.0";
version = "0.14.4";
src = fetchFromGitHub {
owner = "benjajaja";
repo = "mdfried";
tag = "v${finalAttrs.version}";
hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA=";
hash = "sha256-MvyLJyCfZw4pCJOHwqcxtgKVrUE7dHFzoVyQwwfA69k=";
};
cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk=";
cargoHash = "sha256-FFKtJI3mBkRQARm6urcgbUNnBEyZA3BI4epsRVb1dwc=";
doCheck = true;
pkgs/by-name/oc/oci-cli/package.nix
+2 -2
View File
@@ -25,14 +25,14 @@ in
py.pkgs.buildPythonApplication rec {
pname = "oci-cli";
version = "3.69.0";
version = "3.70.0";
pyproject = true;
src = fetchFromGitHub {
owner = "oracle";
repo = "oci-cli";
tag = "v${version}";
hash = "sha256-mGwe3I8LobdoIQQrWLUDz0ARD8/WVIoNt80TatdtDKo=";
hash = "sha256-RB6NTxLFHnDunDEPTVg9fWoIKiWCAzUgzhlydFshmaI=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/po/poutine/package.nix
+6 -4
View File
@@ -8,22 +8,25 @@
buildGoModule rec {
pname = "poutine";
version = "0.15.2";
version = "1.0.4";
src = fetchFromGitHub {
owner = "boostsecurityio";
repo = "poutine";
tag = "v${version}";
hash = "sha256-YBoGsexYT2/lAWEajMVa/xNRBv1R1i0hB6pTAlk43E0=";
hash = "sha256-Rk4Fd/h83NKIVlz/QXOSLnCKfxfKFXUfvUF5FSjomQY=";
};
vendorHash = "sha256-CZLzIGu6jj4JXmKJaWmyeRvcRNjBYecblW47kcsg5Nw=";
vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE=";
ldflags = [
"-s"
"-w"
];
# "dagger" directory contains its own go module, which should be excluded from the build
excludedPackages = [ "dagger" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
@@ -40,6 +43,5 @@ buildGoModule rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "poutine";
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/qo/qovery-cli/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "qovery-cli";
version = "1.53.0";
version = "1.54.0";
src = fetchFromGitHub {
owner = "Qovery";
repo = "qovery-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-kE45z/uObUcmjiYm7zO14Lhroe7PkD0pSYnRw4HbHcc=";
hash = "sha256-6z5s6bVzPYUHI3rBEddQT933Lj+hbcBK+safi5pHVO4=";
};
vendorHash = "sha256-TDvlICfKLtrG/0KPpfrN61wpUZejaJGiRR4DUBNEllY=";
vendorHash = "sha256-1TprPzZb+Q9QcoGop6CAmnyqSU3dQ5CSAS0hsnQeWPw=";
env.CGO_ENABLED = 0;
pkgs/by-name/sd/SDL_compat/package.nix
+13 -4
View File
@@ -4,6 +4,7 @@
cmake,
darwin,
fetchFromGitHub,
fetchpatch2,
libGLU,
libiconv,
libX11,
@@ -84,10 +85,18 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $out/lib/pkgconfig/sdl12_compat.pc $out/lib/pkgconfig/sdl.pc
'';
# The setup hook scans paths of buildInputs to find SDL related packages and
# adds their include and library paths to environment variables. The sdl-config
# is patched to use these variables to produce correct flags for compiler.
patches = [ ./find-headers.patch ];
patches = [
# The setup hook scans paths of buildInputs to find SDL related packages and
# adds their include and library paths to environment variables. The sdl-config
# is patched to use these variables to produce correct flags for compiler.
./find-headers.patch
# https://github.com/libsdl-org/sdl12-compat/issues/382
(fetchpatch2 {
url = "https://github.com/libsdl-org/sdl12-compat/commit/bef8f7412dd44edc4f7e14dc35d3b20399e25496.patch?full_index=1";
hash = "sha256-5kJawjmA8C3uH3OIXHmqQjnIRtoTJtXmm3iLxG3e1qc=";
})
];
setupHook = ./setup-hook.sh;
passthru.tests = {
pkgs/by-name/tr/trufflehog/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.90.12";
version = "3.90.13";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
hash = "sha256-r+j9YnRKQ5m7XLavM5rARRZwDiNTcGmxpL6Sv8eTZLE=";
hash = "sha256-mds8LVRws1r91OoGy4kQXyXdPM0GfTnbkh1Q6ib52x8=";
};
vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM=";
pkgs/by-name/uu/uutils-coreutils/package.nix
+5
View File
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM=";
};
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
rm .cargo/config.toml
'';
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "uutils-coreutils-${finalAttrs.version}";
pkgs/by-name/vc/vcv-rack/package.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{
alsa-lib,
apple-sdk_13,
apple-sdk_14,
cmake,
copyDesktopItems,
curl,
@@ -123,7 +123,7 @@ let
libjack2
libpulseaudio
]
++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_13 ];
++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_14 ];
cmakeFlags = [
(lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux)
@@ -277,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: {
libpulseaudio
zenity
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ];
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_14 ];
enableParallelBuilding = true;
pkgs/by-name/yc/ycmd/package.nix
+2 -3
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation {
pname = "ycmd";
version = "0-unstable-2025-06-16";
version = "0-unstable-2025-10-24";
# required for third_party directory creation
src = fetchFromGitHub {
owner = "ycm-core";
repo = "ycmd";
rev = "9160b4eee67ea61c8501bad36d061bcec5340021";
rev = "7895484ad55e0cbd0686e882891d59661f183476";
hash = "sha256-MSzYX1vXuhd4TNxUfHWaRu7O0r89az1XjZBIZ6B3gBk=";
fetchSubmodules = true;
};
@@ -50,7 +50,6 @@ stdenv.mkDerivation {
++ [
jedi
jedi-language-server
pybind11
];
buildPhase = ''
pkgs/development/compilers/jetbrains-jdk/jcef.nix
+17 -74
View File
@@ -1,7 +1,6 @@
{
fetchFromGitHub,
fetchurl,
fetchzip,
stdenv,
cmake,
python3,
@@ -16,66 +15,16 @@
debugBuild ? false,
glib,
nss,
nspr,
atk,
at-spi2-atk,
libdrm,
libGL,
expat,
libxcb,
libxkbcommon,
libX11,
libXcomposite,
libXdamage,
libXext,
libXfixes,
libXrandr,
libgbm,
gtk3,
pango,
cairo,
alsa-lib,
dbus,
at-spi2-core,
cups,
libxshmfence,
udev,
boost,
thrift,
cef-binary,
}:
let
rpath = lib.makeLibraryPath [
glib
nss
nspr
atk
at-spi2-atk
libdrm
libGL
expat
libxcb
libxkbcommon
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXrandr
libgbm
gtk3
pango
cairo
alsa-lib
dbus
at-spi2-core
cups
libxshmfence
udev
];
buildType = if debugBuild then "Debug" else "Release";
platform =
{
@@ -99,6 +48,19 @@ let
.${platform};
inherit (arches) depsArch projectArch targetArch;
# `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt
cef-name = "cef_binary_137.0.17+gf354b0e+chromium-137.0.7151.104_${platform}_minimal";
cef-bin = cef-binary.override {
version = "137.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
gitRevision = "f354b0e";
chromiumVersion = "137.0.7151.104";
srcHashes = {
aarch64-linux = "sha256-C9P4+TpzjyMD5z2qLbzubbrIr66usFjRx7QqiAxI2D8=";
x86_64-linux = "sha256-iDC3a/YN0NqjX/b2waKvUAZCaR0lkLmUPqBJphE037Q=";
};
};
thrift20 = thrift.overrideAttrs (old: {
version = "0.20.0";
@@ -149,22 +111,7 @@ stdenv.mkDerivation rec {
inherit rev;
hash = "sha256-BHmGEhfkrUWDfrUFR8d5AgIq8qkAr+blX9n7ZVg8mtc=";
};
cef-bin =
let
# `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt
name = "cef_binary_137.0.17+gf354b0e+chromium-137.0.7151.104_${platform}_minimal";
hash =
{
"linuxarm64" = "sha256-QKkJwLtYS3o7lf4T31jIww2LGuAJT3sNTeI3Jq0VEYQ=";
"linux64" = "sha256-qE5SOi0/6dPsewyemarTbWG9MbWCQUlng8TgqU+4Tak=";
}
.${platform};
urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name;
in
fetchzip {
url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2";
inherit name hash;
};
# Find the hash in tools/buildtools/linux64/clang-format.sha1
clang-fmt = fetchurl {
url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263";
@@ -176,12 +123,8 @@ stdenv.mkDerivation rec {
patchShebangs .
cp -r ${cef-bin} third_party/cef/${cef-bin.name}
chmod +w -R third_party/cef/${cef-bin.name}
patchelf third_party/cef/${cef-bin.name}/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so
patchelf third_party/cef/${cef-bin.name}/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1
patchelf third_party/cef/${cef-bin.name}/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker)
sed 's/-O0/-O2/' -i third_party/cef/${cef-bin.name}/cmake/cef_variables.cmake
cp -r ${cef-bin} third_party/cef/${cef-name}
chmod +w -R third_party/cef/${cef-name}
sed \
-e 's|os.path.isdir(os.path.join(path, \x27.git\x27))|True|' \
pkgs/development/libraries/libcef/default.nix
-168
View File
@@ -1,168 +0,0 @@
{
lib,
stdenv,
fetchurl,
cmake,
glib,
nss,
nspr,
atk,
at-spi2-atk,
libdrm,
expat,
libxcb,
libxkbcommon,
libX11,
libXcomposite,
libXdamage,
libXext,
libXfixes,
libXrandr,
libgbm,
gtk3,
pango,
cairo,
alsa-lib,
dbus,
at-spi2-core,
cups,
libxshmfence,
libGL,
udev,
systemd,
obs-studio,
xorg,
}:
let
gl_rpath = lib.makeLibraryPath [ stdenv.cc.cc ];
rpath = lib.makeLibraryPath [
glib
nss
nspr
atk
at-spi2-atk
libdrm
expat
libxcb
libxkbcommon
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXrandr
libgbm
gtk3
pango
cairo
alsa-lib
dbus
at-spi2-core
cups
libxshmfence
libGL
udev
systemd
xorg.libxcb
xorg.libX11
xorg.libXcomposite
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXrandr
xorg.libxshmfence
];
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
platformInfo = selectSystem {
aarch64-linux = {
platformStr = "linuxarm64";
projectArch = "arm64";
};
x86_64-linux = {
platformStr = "linux64";
projectArch = "x86_64";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "libcef";
version = "141.0.7";
gitRevision = "a5714cc";
chromiumVersion = "141.0.7390.108";
buildType = "Release";
srcHash = selectSystem {
aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE=";
x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk=";
};
src = fetchurl {
url = "https://cef-builds.spotifycdn.com/cef_binary_${finalAttrs.version}+g${finalAttrs.gitRevision}+chromium-${finalAttrs.chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
hash = finalAttrs.srcHash;
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ];
makeFlags = [ "libcef_dll_wrapper" ];
dontStrip = true;
dontPatchELF = true;
preInstall = ''
patchelf --set-rpath "${rpath}" --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ../${finalAttrs.buildType}/chrome-sandbox
patchelf --add-needed libudev.so --set-rpath "${rpath}" ../${finalAttrs.buildType}/libcef.so
patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libEGL.so
patchelf --add-needed libGL.so.1 --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libGLESv2.so
patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libvk_swiftshader.so
patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libvulkan.so.1
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/ $out/share/cef/ $out/libexec/cef/
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
cp ../${finalAttrs.buildType}/libcef.so $out/lib/
cp ../${finalAttrs.buildType}/libEGL.so $out/lib/
cp ../${finalAttrs.buildType}/libGLESv2.so $out/lib/
cp ../${finalAttrs.buildType}/libvk_swiftshader.so $out/lib/
cp ../${finalAttrs.buildType}/libvulkan.so.1 $out/lib/
cp ../${finalAttrs.buildType}/chrome-sandbox $out/libexec/cef/
cp ../${finalAttrs.buildType}/*.bin ../${finalAttrs.buildType}/*.json $out/share/cef/
cp -r ../Resources/* $out/share/cef/
cp -r ../include $out/
runHook postInstall
'';
passthru = {
updateScript = ./update.sh;
tests = {
inherit obs-studio; # frequently breaks on CEF updates
};
};
meta = {
description = "Simple framework for embedding Chromium-based browsers in other applications";
homepage = "https://cef-builds.spotifycdn.com/index.html";
maintainers = with lib.maintainers; [ puffnfresh ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode
];
license = lib.licenses.bsd3;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
};
})
pkgs/development/python-modules/alexapy/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "alexapy";
version = "1.29.8";
version = "1.29.9";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "keatontaylor";
repo = "alexapy";
tag = "v${version}";
hash = "sha256-AmczPJK7v1ymRT3XUUNzFR8GmDr9eZYGRH2FL3RvPsE=";
hash = "sha256-Ecj4IQd0UJuNcGqSj48WrULyOwkbNh1YITkj0ftS7yY=";
};
pythonRelaxDeps = [ "aiofiles" ];
pkgs/development/python-modules/cerberus/default.nix
+2 -5
View File
@@ -4,22 +4,19 @@
fetchFromGitHub,
poetry-core,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "cerberus";
version = "1.3.7";
version = "1.3.8";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "pyeve";
repo = "cerberus";
tag = version;
hash = "sha256-KYZpd8adKXahSc/amQHZMFdJtEtZLklZZgwfkYu8/qY=";
hash = "sha256-C7YZjqQtdkakqHXBU3cFUl/gCFvCl3saP14eqt2fdAM=";
};
build-system = [
pkgs/development/python-modules/hier-config/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "hier-config";
version = "3.2.2";
version = "3.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "netdevops";
repo = "hier_config";
tag = "v${version}";
hash = "sha256-3xSxzdIxoQgJtA3CX141jP2Zl2j8Dwfplv4JYpHpCdQ=";
hash = "sha256-rIZ87jzpvSluDo+g3a2aHSmD7JXbZFHa7tvHePUwboI=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/htmldate/default.nix
+2 -8
View File
@@ -1,6 +1,5 @@
{
lib,
backports-datetime-fromisoformat,
buildPythonPackage,
charset-normalizer,
dateparser,
@@ -9,23 +8,20 @@
lxml,
pytestCheckHook,
python-dateutil,
pythonOlder,
setuptools,
urllib3,
}:
buildPythonPackage rec {
pname = "htmldate";
version = "1.9.3";
version = "1.9.4";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "adbar";
repo = "htmldate";
tag = "v${version}";
hash = "sha256-9uFf/sx0AZdlvizU65H87hbtwDKf8Ykm67bKM9Oq//s=";
hash = "sha256-ZSHQgj6zXmLdqDQWGnh2l70iXzdohsxdAIQGDSBufIA=";
};
build-system = [ setuptools ];
@@ -45,13 +41,11 @@ buildPythonPackage rec {
faust-cchardet
urllib3
]
++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
++ urllib3.optional-dependencies.brotli;
all = [
faust-cchardet
urllib3
]
++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ]
++ urllib3.optional-dependencies.brotli;
};
pkgs/development/python-modules/iamdata/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "iamdata";
version = "0.1.202511081";
version = "0.1.202511091";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${version}";
hash = "sha256-0yV5yZ0gElw2p8UjwU6ujkXu1DV2cmOPlG9XgObUNUA=";
hash = "sha256-1XO1vovWAMIKOdEPKANLUBTfOHQuQrkp3ie5aAFYlDI=";
};
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/jedi-language-server/default.nix
+10 -12
View File
@@ -11,19 +11,20 @@
# dependencies
docstring-to-markdown,
jedi,
lsprotocol,
pydantic,
pygls,
lsprotocol_2025,
cattrs,
pygls_2,
# tests
pytestCheckHook,
pyhamcrest,
python-lsp-jsonrpc,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
pname = "jedi-language-server";
version = "0.45.1";
version = "0.46.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
owner = "pappasam";
repo = "jedi-language-server";
tag = "v${version}";
hash = "sha256-uO7+ui9FEeMF4sC/jI91px5wEWecvfJApogFMfwpPEs=";
hash = "sha256-8B/FYktdWtZvB8Us6zQ3gvx1MxJTzP2xyj1VhnM+Viw=";
};
build-system = [
@@ -42,21 +43,18 @@ buildPythonPackage rec {
dependencies = [
docstring-to-markdown
jedi
lsprotocol
pydantic
pygls
lsprotocol_2025
cattrs
pygls_2
];
nativeCheckInputs = [
pytestCheckHook
pyhamcrest
python-lsp-jsonrpc
writableTmpDirAsHomeHook
];
preCheck = ''
HOME="$(mktemp -d)"
'';
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# https://github.com/pappasam/jedi-language-server/issues/313
"test_publish_diagnostics_on_change"
pkgs/development/python-modules/libuuu/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "libuuu";
version = "1.5.233";
version = "1.5.239";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-SbnQs+khNT1DwrctwHi0rsuO1WR/KgA7TUFARw9AHAU=";
hash = "sha256-fknRdLwdB3JCnd6OJzU4jiOWvKgsQJdYkvBgONddaCY=";
};
build-system = [
pkgs/development/python-modules/lsp-tree-sitter/default.nix
+4 -4
View File
@@ -7,21 +7,21 @@
colorama,
jinja2,
jsonschema,
pygls,
pygls_2,
tree-sitter,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "lsp-tree-sitter";
version = "0.0.18";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "neomutt";
repo = "lsp-tree-sitter";
tag = version;
hash = "sha256-Hjl3EASaOWmLZpBxmyelSUTy7jJEIEo77IIQh5DHIbg=";
hash = "sha256-H5yb33ZsqRtqm1zlnOI0WUfcM2VDKn+qyezmFNtdLGA=";
};
build-system = [
@@ -33,7 +33,7 @@ buildPythonPackage rec {
colorama
jinja2
jsonschema
pygls
pygls_2
tree-sitter
];
nativeCheckInputs = [ pytestCheckHook ];
pkgs/development/python-modules/metaflow/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "metaflow";
version = "2.19.0";
version = "2.19.6";
pyproject = true;
src = fetchFromGitHub {
owner = "Netflix";
repo = "metaflow";
tag = version;
hash = "sha256-MMPkQ1cjl/Sid4RyvP04xIDb6Xtr5S+LdJTOYgo0LFQ=";
hash = "sha256-heJz9rk2nTMrHc2213J1die6QX/jkOG6ohmufGXCNso=";
};
build-system = [
pkgs/development/python-modules/mitogen/default.nix
+2 -5
View File
@@ -2,22 +2,19 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "mitogen";
version = "0.3.30";
version = "0.3.31";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mitogen-hq";
repo = "mitogen";
tag = "v${version}";
hash = "sha256-witxGRPi2TOwLOnsJcxOKLJdZ6ggapANXneFMJdHa98=";
hash = "sha256-ecDRva+K/caMV9T5W5dxFRwJyGvrURpexOa5bNyXkb4=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/model-checker/default.nix
+2 -5
View File
@@ -3,7 +3,6 @@
buildPythonPackage,
fetchPypi,
networkx,
pythonOlder,
setuptools,
tqdm,
z3-solver,
@@ -11,15 +10,13 @@
buildPythonPackage rec {
pname = "model-checker";
version = "1.2.11";
version = "1.2.12";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "model_checker";
inherit version;
hash = "sha256-OcF1aJgQFB+YTC6Ksx/WImKciOjodY0wq/KRUAxiqqU=";
hash = "sha256-vIH3CFgFEO+UlmpS7FhBsQtZv5Yep4OQ6koMGzyJGa4=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
pkgs/development/python-modules/philipstv/default.nix
+3 -6
View File
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
buildPythonPackage,
pythonOlder,
poetry-core,
poetry-dynamic-versioning,
installShellFiles,
@@ -18,16 +17,14 @@
buildPythonPackage rec {
pname = "philipstv";
version = "2.1.1";
version = "3.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bcyran";
repo = "philipstv";
tag = version;
hash = "sha256-BvQurZls9NjtHhTXLQ9t8fHkAF/QU/c6mmRvNmE0v90=";
hash = "sha256-9OlPaGruD6HDJArvIOb/pIVw5nqTUleDfxeYp2xBbEA=";
};
build-system = [
@@ -65,7 +62,7 @@ buildPythonPackage rec {
meta = {
description = "CLI and library to control Philips Android-powered TVs";
homepage = "https://github.com/bcyran/philipstv";
changelog = "https://github.com/bcyran/philipstv/releases/tag/${version}";
changelog = "https://github.com/bcyran/philipstv/releases/tag/${src.tag}";
license = lib.licenses.mit;
mainProgram = "philipstv";
maintainers = with lib.maintainers; [ bcyran ];
pkgs/development/python-modules/pylacus/default.nix
+2 -5
View File
@@ -3,22 +3,19 @@
buildPythonPackage,
fetchFromGitHub,
poetry-core,
pythonOlder,
requests,
}:
buildPythonPackage rec {
pname = "pylacus";
version = "1.19.0";
version = "1.19.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ail-project";
repo = "PyLacus";
tag = "v${version}";
hash = "sha256-Ezp/aFTETvU1bOZZvMlZn0XmaLWoOd6l8s0n5lIqV2w=";
hash = "sha256-aOTXz/77ZeX0xiMeUIaqDrtpMvIM7Idp+3rYeXJ4bpg=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/pytest-lsp/default.nix
+6 -4
View File
@@ -3,20 +3,21 @@
fetchPypi,
buildPythonPackage,
hatchling,
pygls,
pygls_2,
pytestCheckHook,
pytest-asyncio,
packaging,
}:
buildPythonPackage rec {
pname = "pytest-lsp";
version = "0.4.3";
version = "1.0.0";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "pytest_lsp";
hash = "sha256-ND9r2i+qMg7V/Ld8lCDScDzlZdHRRP6CfjGYp9wpkRw=";
hash = "sha256-uoyVstl1o2Akn/pXaOHm9E2H0Q73dUBw07MhECckovE=";
};
build-system = [
@@ -24,8 +25,9 @@ buildPythonPackage rec {
];
dependencies = [
pygls
pygls_2
pytest-asyncio
packaging
];
nativeCheckInputs = [
pkgs/development/python-modules/ufmt/default.nix
+4 -16
View File
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
# build-system
flit-core,
@@ -18,7 +17,7 @@
usort,
# optional-dependencies
pygls,
pygls_2,
ruff-api,
# tests
@@ -28,27 +27,16 @@
buildPythonPackage rec {
pname = "ufmt";
version = "2.8.0";
version = "2.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "omnilib";
repo = "ufmt";
tag = "v${version}";
hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
hash = "sha256-/5sfawsBmsStCCdu4lIq2iL0zywrWAN+qW/t3h2UIu0=";
};
patches = [
# Fix click 8.2.x incompatibility
# TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
# https://github.com/omnilib/ufmt/pull/260
(fetchpatch2 {
name = "fix-click-incompatibility.patch";
url = "https://github.com/omnilib/ufmt/pull/260/commits/7980d7cd0a29fbd287e10d939248ef7c9d38a660.patch";
hash = "sha256-97/jQVGCC+PXk8uxyF/M7XlLuVqJ5SgQZd/MXkaiO70=";
})
];
build-system = [ flit-core ];
dependencies = [
@@ -63,7 +51,7 @@ buildPythonPackage rec {
];
optional-dependencies = {
lsp = [ pygls ];
lsp = [ pygls_2 ];
ruff = [ ruff-api ];
};
pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
+4 -6
View File
@@ -9,23 +9,20 @@
pytest-asyncio,
pytest-mock,
pytestCheckHook,
pythonOlder,
setuptools,
websockets,
}:
buildPythonPackage rec {
pname = "whirlpool-sixth-sense";
version = "1.0.2";
version = "1.0.3";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "abmantis";
repo = "whirlpool-sixth-sense";
tag = version;
hash = "sha256-Xgz9SqH++pWZb7r1qxOrEEfC7I80qhrqcI0Zlduxlq4=";
hash = "sha256-SXa5Ccnng1McWgSWy85xCEr7odtBSJtJhjZoC/JfI/A=";
};
build-system = [ setuptools ];
@@ -49,7 +46,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for Whirlpool 6th Sense appliances";
homepage = "https://github.com/abmantis/whirlpool-sixth-sense/";
license = with licenses; [ mit ];
changelog = "https://github.com/abmantis/whirlpool-sixth-sense/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
pkgs/development/python-modules/xknx/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "3.10.0";
version = "3.10.1";
pyproject = true;
src = fetchFromGitHub {
owner = "XKNX";
repo = "xknx";
tag = version;
hash = "sha256-tkZ0Hltpd5DARxYc05LjDTlB62jsJJJ8v/oUuVPT/uo=";
hash = "sha256-vyGQ1e4MDkCau1hQkcxKfUgEo9PYUXzeky4LSqOW93E=";
};
build-system = [ setuptools ];
pkgs/top-level/aliases.nix
+1
View File
@@ -798,6 +798,7 @@ mapAliases {
libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27
libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27
libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06
libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
pkgs/top-level/all-packages.nix
-6
View File
@@ -2758,10 +2758,6 @@ with pkgs;
gawkInteractive = gawk.override { interactive = true; };
ggshield = callPackage ../tools/security/ggshield {
python3 = python311;
};
gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix {
@@ -7645,8 +7641,6 @@ with pkgs;
libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
libcef = callPackage ../development/libraries/libcef { };
libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; };