Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -214,9 +214,8 @@ rec {
|
||||
pkgs.brotli
|
||||
pkgs.python3
|
||||
];
|
||||
options = builtins.toFile "options.json" (
|
||||
builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)
|
||||
);
|
||||
passAsFile = [ "options" ];
|
||||
options = builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix);
|
||||
# merge with an empty set if baseOptionsJSON is null to run markdown
|
||||
# processing on the input options
|
||||
baseJSON = if baseOptionsJSON == null then builtins.toFile "base.json" "{}" else baseOptionsJSON;
|
||||
@@ -229,7 +228,7 @@ rec {
|
||||
TOUCH_IF_DB=$dst/.used-docbook \
|
||||
python ${./mergeJSON.py} \
|
||||
${lib.optionalString warningsAreErrors "--warnings-are-errors"} \
|
||||
$baseJSON $options \
|
||||
$baseJSON $optionsPath \
|
||||
> $dst/options.json
|
||||
|
||||
if grep /nixpkgs/nixos/modules $dst/options.json; then
|
||||
|
||||
@@ -11,14 +11,12 @@ in
|
||||
boot = {
|
||||
# Must disable Enhanced Retransmission Mode to support bluetooth pairing
|
||||
# https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth
|
||||
extraModprobeConfig = lib.mkIf (
|
||||
config.hardware.bluetooth.enable
|
||||
&& (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12")
|
||||
) "options bluetooth disable_ertm=1";
|
||||
|
||||
extraModprobeConfig = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12") "options bluetooth disable_ertm=1";
|
||||
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
|
||||
kernelModules = [ "hid_xpadneo" ];
|
||||
};
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -573,7 +573,6 @@ in
|
||||
|
||||
systemd.services.libvirt-guests = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "libvirtd.service" ];
|
||||
after = [ "libvirtd.service" ];
|
||||
path = with pkgs; [
|
||||
coreutils
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.20";
|
||||
hash = "sha256-8r2/bF5zkq4LkMKvI5YcBMaaMzgWAIezdIwTMQQBHsM=";
|
||||
version = "2.1.25";
|
||||
hash = "sha256-9x9wDngiHfjUHTsUEraF7pUjbHlmcT7VotiPV9bPwIo=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1357,8 +1357,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "competitive-programming-helper";
|
||||
publisher = "DivyanshuAgrawal";
|
||||
version = "2025.7.1752155836";
|
||||
hash = "sha256-vI30wuv8833sG0RZdStBSSYTPbtt5ZrsRX+1iAVI7yg=";
|
||||
version = "2025.12.1766739309";
|
||||
hash = "sha256-innqhXTflK6yS9n3Sw1sbRKT4/BT+Aa6hsKrc1pOsZ4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
|
||||
@@ -4784,8 +4784,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.91.0";
|
||||
hash = "sha256-nvcISWilvPXIm/er3QnM2aOhrWn2BgOL0aXpGHpDw9M=";
|
||||
version = "0.106.0";
|
||||
hash = "sha256-Rlm6GP5y5cs+qPEgd7oMHJ7W74HmBW5VM5YC29MjntE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.53.1";
|
||||
hash = "sha256-jMldzLsB4Wdwzzq0vyy1n89G6UaycGz+XReHrwfzpkc=";
|
||||
version = "3.56.2";
|
||||
hash = "sha256-CtRtOPrLI4KW6nsK/sTvbPN43jkcS5ZxkXw18ydTBpQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hypr-darkwindow";
|
||||
version = "0.53.1";
|
||||
version = "0.53.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micha4w";
|
||||
|
||||
@@ -42,13 +42,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.3.2958.0";
|
||||
version = "3.3.3598.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
tag = version;
|
||||
hash = "sha256-3srkgTAQtxzT+orI1ntb9gt+pKWxVEFvUkQOarHCr7I=";
|
||||
hash = "sha256-keagFjifd3Ok3mgheDAb9OSGHmd3HBOo5I0WaBHWJzE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "apkeep";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8=";
|
||||
hash = "sha256-Sk8CQaMXtPPJh2nGgGthyzuvkVViQ0jtqPjAqo2dtpg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CwucGAwAvxePNQu5p1OWx9o9xsvpzX1abH6HyF43nEE=";
|
||||
cargoHash = "sha256-PTuhD73R0AxykkVeFEHaVnXrOTHJoRl0CxBJmeh3WgQ=";
|
||||
|
||||
prePatch = ''
|
||||
rm .cargo/config.toml
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "artisan";
|
||||
version = "3.4.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
|
||||
hash = "sha256-aAxFfghEf+MRDZBd0FD5OphOOVhz3Nt2wUOmhrwXGh4=";
|
||||
hash = "sha256-Oe671eWyiQtddCZM8dydh/YldNRV7qmdA7lwQhE9sag=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.86.142";
|
||||
version = "1.86.146";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-K0Df1uZb802SVFKnj/dNShPZSw46DYvwxKG8w9bzB20=";
|
||||
hash = "sha256-/Z2KLxURCgBfqunQUrspn9wS2QAjlWQBd3K7uXwk+fk=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-juFpIax+GzXsVPkSz2U0hjczIaaF8Mj+CT0uqKgaRQo=";
|
||||
hash = "sha256-T8/Yv5jn4Fa79eDj0IFE9P9FbCSf7H2V/UY9S/i3C3c=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-uQA2jA+QMbON3z8lHclxe1/S2OszitS9xYbTCS5MR+Q=";
|
||||
hash = "sha256-BD4M16DVvcy0HGPrRc6l0T/so0mGicgaa7QvdGqfqKs=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-kzhi03Q30mqK+XNaLpJ9zvHiCgYAJZqX7npL7ywMZbE=";
|
||||
hash = "sha256-tbotgvXI706iM+VrXW6QA2ewxqQHqaFvV30cb7PwSrY=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,34 +1,34 @@
|
||||
{
|
||||
"version": "2.1.21",
|
||||
"buildDate": "2026-01-28T01:39:36Z",
|
||||
"version": "2.1.25",
|
||||
"buildDate": "2026-01-29T20:35:15Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"checksum": "e8265d8719f131ab8f2863e66ce69cc829c4f55387ae2286e45d4a06b802c6fd",
|
||||
"size": 181892336
|
||||
"checksum": "1023c0334b0bf99ce7a466adbdb24ed0cae0ce4e1138837238e132b3886dd789",
|
||||
"size": 182288624
|
||||
},
|
||||
"darwin-x64": {
|
||||
"checksum": "1824c9a01e0266bef1c0da880503e49db08823cf7eb6a54fef2a385028c2bb05",
|
||||
"size": 188189376
|
||||
"checksum": "13fc5f92b6fec84b674ac7cf506524323f012cf999740733f7377f6fb46bcfd7",
|
||||
"size": 188585664
|
||||
},
|
||||
"linux-arm64": {
|
||||
"checksum": "e043ed95e4df4282a9adb34eb51ee14d59a53f2feeeb19884a6b4edeccbe7f3a",
|
||||
"size": 216288068
|
||||
"checksum": "38016991376efb8b1a83488800a9589694a6e77a7a920c5e654778c68753c776",
|
||||
"size": 216667439
|
||||
},
|
||||
"linux-x64": {
|
||||
"checksum": "35fcccfced2e8669dc4aacf2bb76fab9816bcc5fc566e66b5ae42f4e7b4474b1",
|
||||
"size": 224093184
|
||||
"checksum": "696135f0eccaf7a4070168845146833fa4fc93a6191fe026a7517af4d2e14fec",
|
||||
"size": 224472763
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"checksum": "5e453c59b3c8fea4e6848e0972ab093e8eda4711e2be20b68dd4ebaea12db4e1",
|
||||
"size": 211552100
|
||||
"checksum": "a6aee1f2d6e5010432a589fc52772e44186099e3d1fd94419b1689ff860935de",
|
||||
"size": 211931471
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"checksum": "afa929dbccd23f746b01821699b1985eb7cc35018d0a8e9bbab678764ea58fb7",
|
||||
"size": 216781760
|
||||
"checksum": "bd51f99dca3ba650ce74d9a491d6fae06da7f48e426d2948b0aed274eb34b141",
|
||||
"size": 217161339
|
||||
},
|
||||
"win32-x64": {
|
||||
"checksum": "325abe8bb0b907c008e229085815c938037864411ced6c553dbb52e0be587efe",
|
||||
"size": 233936544
|
||||
"checksum": "d47eb36d833a4a9c74fac9a91026cd7f8959d509bb6b7a14702fb2a72e7c0b66",
|
||||
"size": 234309792
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.20",
|
||||
"version": "2.1.25",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.20",
|
||||
"version": "2.1.25",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.20";
|
||||
version = "2.1.25";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-V2BIqUUJnQpjIsCAAk932L8wp5T74s22q3KgFoxfdDg=";
|
||||
hash = "sha256-61tEjrW4WFAbichsQJwAUjEecMiDmYGvgeqAhuqs3IA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-X8j7httM9qMpAPR11oDAWwDpkxZ2bc20y6ruMoStMsQ=";
|
||||
npmDepsHash = "sha256-QH117ZS1pJgqTorGgn/YY/oU0X2/b033dOqRcU+oR5M=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "florist";
|
||||
pname = "florist";
|
||||
version = "24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -29,16 +29,16 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pangolin";
|
||||
version = "1.13.1";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "pangolin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rDysze915lmgbl/nz2NaPrFgNHAVOYRY4sVMnoYB3xE=";
|
||||
hash = "sha256-SItYudhY+4JQ8Qrm2FgR5se9blETE5y0i1nnjZNQli4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-mSSzrkGZ0ZPYINRahzrbrO6oLDhmu8HWHfHzZKMroCg=";
|
||||
npmDepsHash = "sha256-4uGIR0KnVl0SvTnD14bavqlv00aX91s2caPPLPdlhO4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
@@ -49,12 +49,12 @@ buildNpmPackage (finalAttrs: {
|
||||
# Based on pkgs.nextjs-ollama-llm-ui.
|
||||
postPatch = ''
|
||||
substituteInPlace src/app/layout.tsx --replace-fail \
|
||||
"{ Inter } from \"next/font/google\"" \
|
||||
"{ Geist, Inter, Manrope, Open_Sans } from \"next/font/google\"" \
|
||||
"localFont from \"next/font/local\""
|
||||
|
||||
substituteInPlace src/app/layout.tsx --replace-fail \
|
||||
"Inter({ subsets: [\"latin\"] })" \
|
||||
"localFont({ src: './Inter.ttf' })"
|
||||
"const font = Inter({${"\n"} subsets: [\"latin\"]${"\n"}});" \
|
||||
"const font = localFont({ src: './Inter.ttf' });"
|
||||
|
||||
cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
|
||||
'';
|
||||
@@ -91,6 +91,8 @@ buildNpmPackage (finalAttrs: {
|
||||
cp -r init $out/share/pangolin/dist/init
|
||||
|
||||
cp server/db/names.json $out/share/pangolin/dist/names.json
|
||||
cp server/db/ios_models.json $out/share/pangolin/dist/ios_models.json
|
||||
cp server/db/mac_models.json $out/share/pangolin/dist/mac_models.json
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gradle-completion";
|
||||
version = "9.3.0";
|
||||
version = "9.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gradle";
|
||||
repo = "gradle-completion";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kmjlEO0MI7+OwZqgwkv5z8iX1iAZDiIpqevoeb1sDUU=";
|
||||
hash = "sha256-PeX8ygojftjXGqeRWvPOm/FLlCCH0kikF/MO3olKbKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.75.7";
|
||||
version = "1.83.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-XGbkfjmceb+IFl3sERpd8zqdTQQAkpiyTxZDoIyoFmY=";
|
||||
hash = "sha256-XQELvBRTq5vaf6mDI5ywkH3GgV5gvDqKGDbbYZR1abQ=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "highscore-mgba";
|
||||
version = "0-unstable-2026-01-20";
|
||||
version = "0-unstable-2026-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "mgba";
|
||||
rev = "6ac84f6fadf70e7cee2eef44bece34b3a498f5a2";
|
||||
hash = "sha256-k4gmJZFv3MQDIX7trXqTnBI4S4ugWYp2CGMrPeproSE=";
|
||||
rev = "9727cd743a0e647913a024d57a535e8cbb4dc0f7";
|
||||
hash = "sha256-2cwoRXW8IjA1ojsuDRdNlrzPdbqIs2g2qyTXF4nMhWs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-sameboy";
|
||||
version = "0-unstable-2026-01-05";
|
||||
version = "0-unstable-2026-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "SameBoy";
|
||||
rev = "8c9700abf0bbff49003540ddbe339110bf0b05a9";
|
||||
hash = "sha256-IEuqc2pTWHE5nwgANPcsuufE2U5VsqGQr63ikH47BO4=";
|
||||
rev = "00922fa99b723aae3837d9e2eecb28cbeaca1b59";
|
||||
hash = "sha256-FkJ2VOY6Na73gIpu1MrK37Lo/aHfWKOwnFsXRuKHKsI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/highscore";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-stella";
|
||||
version = "0-unstable-2026-01-02";
|
||||
version = "0-unstable-2026-01-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "stella";
|
||||
rev = "a8d92c100e83ae2249c5b30afcaa4b4ed31fcc46";
|
||||
hash = "sha256-QfKtAIMCqniF15vCuWKz/pwb0FuE6xDp6/rfeUWpMgQ=";
|
||||
rev = "689e4325099fbc348a92be40237d94bba692aff4";
|
||||
hash = "sha256-7+/qgWUiL/dzacuFmbQiAOO+R71rFas+Tf0kpZHOjgY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/os/highscore";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hl-log-viewer";
|
||||
version = "0.35.2";
|
||||
version = "0.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pamburus";
|
||||
repo = "hl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jCUr+9FPYnGRbeQkrJjfb9/Cjn3kq40z6cYkU4Gomts=";
|
||||
hash = "sha256-eEILIQ24QG2zAafex9dGQxQyXB6W8QVgqST3nL9hsI0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+QFNdQv2swIEHivQ5E7ujyYk7xa6gM8A5SwJfnKPScY=";
|
||||
cargoHash = "sha256-KPI5rDDbc9WY/S1axMPPCN7ltkwg8W+9Zwm4EiNBZ+k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
testers,
|
||||
nodejs,
|
||||
node-gyp,
|
||||
gnutar,
|
||||
@@ -15,6 +14,7 @@
|
||||
pnpm_9,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
versionCheckHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karakeep";
|
||||
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "karakeep-app";
|
||||
repo = "karakeep";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZYAjbinVMT0iiqojRxcKwQbvDqYteoExm1Ocppka0Ps=";
|
||||
tag = "cli/v${finalAttrs.version}";
|
||||
hash = "sha256-Ssr/KcQHRtEloz4YPAUfUmcbicMumkIQ+wOjxe9PTXM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -143,21 +143,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
find $out -type l ! -exec test -e {} \; -delete
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) karakeep;
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
# remove hardcoded version if upstream syncs general version with cli
|
||||
# version
|
||||
version = "0.29.1";
|
||||
};
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://karakeep.app/";
|
||||
changelog = "https://github.com/karakeep-app/karakeep/releases/tag/v${finalAttrs.version}";
|
||||
description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = [ lib.maintainers.three ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "matrix-brandy";
|
||||
version = "1.23.5";
|
||||
version = "1.23.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stardot";
|
||||
repo = "MatrixBrandy";
|
||||
rev = "V${finalAttrs.version}";
|
||||
hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8=";
|
||||
hash = "sha256-Cyr3nfX8JHf8udTMQKTHy4sNVkSRjtScye6yUffLXHI=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-lrt.patch ];
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mysql-connector-java";
|
||||
version = "9.4.0";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${finalAttrs.version}.zip";
|
||||
hash = "sha256-Ze/HzVelG3p5tFnu0lvP0gKWvGr3yGWGBjlVEBZorJ4=";
|
||||
hash = "sha256-JUTlcbET+e4FNyDssKQ10EwD3riZIRohEfP01JhMpjs=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
+321
-679
File diff suppressed because it is too large
Load Diff
@@ -6,18 +6,18 @@
|
||||
nodejs,
|
||||
}:
|
||||
|
||||
(buildNpmPackage.override { inherit nodejs; }) rec {
|
||||
buildNpmPackage rec {
|
||||
pname = "node-gyp";
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "node-gyp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2BiRCFpGtuV/mL3U3jUkN1Tw91ON78y9iabDM0CMm2U=";
|
||||
hash = "sha256-0XTv7kDc5Mt7e4VuVQeuJusIxwQzePm4PaE9ms6oRoM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-1ARSkUAIId0Y2xtyNjJ4FVx7y6kHZhYi83e4T4A2qS8=";
|
||||
npmDepsHash = "sha256-MflhEEUuzhXb6HTdnz2pvfZJN5w4/dAQ6Cw/C5jSbLs=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
@@ -25,6 +25,8 @@
|
||||
--replace-quiet sys.platform '"${stdenv.targetPlatform.parsed.kernel.name}"'
|
||||
'';
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
# Teach node-gyp to use nodejs headers locally rather that download them form https://nodejs.org.
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts${suffix}";
|
||||
version = "2026.01.01";
|
||||
version = "2026.02.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notofonts";
|
||||
repo = "notofonts.github.io";
|
||||
rev = "noto-monthly-release-${version}";
|
||||
hash = "sha256-CePEUiNyXm0UXo0wJ5CGMkJBNIhdTrEeuIu/8E7uPOc=";
|
||||
hash = "sha256-vhu3jojG6QlgY5gP4bCbpJznsQ1gExAfcRT42FcZUp4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
writableTmpDirAsHomeHook,
|
||||
withXmpp ? false, # sleekxmpp doesn't support python 3.10, see https://github.com/dschep/ntfy/issues/266
|
||||
withMatrix ? true,
|
||||
withSlack ? true,
|
||||
withEmoji ? true,
|
||||
@@ -42,10 +41,6 @@ python3Packages.buildPythonApplication rec {
|
||||
appdirs
|
||||
ntfy-webpush
|
||||
]
|
||||
++ lib.optionals withXmpp [
|
||||
sleekxmpp
|
||||
dnspython
|
||||
]
|
||||
++ lib.optionals withMatrix [
|
||||
matrix-client
|
||||
]
|
||||
@@ -72,12 +67,12 @@ python3Packages.buildPythonApplication rec {
|
||||
disabledTests = [
|
||||
# AssertionError: {'backends': ['default']} != {}
|
||||
"test_default_config"
|
||||
]
|
||||
++ lib.optionals (!withXmpp) [
|
||||
|
||||
# sleekxmpp was deprecated in favor of slixmpp
|
||||
"test_xmpp"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (!withXmpp) [
|
||||
disabledTestPaths = [
|
||||
"tests/test_xmpp.py"
|
||||
];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opencl-caps-viewer";
|
||||
version = "1.20";
|
||||
version = "1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SaschaWillems";
|
||||
repo = "OpenCLCapsViewer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-P7G8FvVXzDAfN3d4pGXC+c9x4bY08/cJNYQ6lvjyVCQ=";
|
||||
hash = "sha256-fQDBo1/mT6Re6FgdB8ImDRAIsnstnzQsz04cRGgjM/M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ let
|
||||
features = [
|
||||
"rustls-webpki"
|
||||
"geosparql"
|
||||
"rdf-12"
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "p3x-onenote";
|
||||
version = "2025.10.103";
|
||||
version = "2025.10.111";
|
||||
|
||||
plat =
|
||||
{
|
||||
@@ -20,9 +20,9 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-6R+QzCeochojB1zo8SWiIVszrjbII+H2R/TReCsPip4=";
|
||||
armv7l-linux = "sha256-jhrPixz/ZHJRIe+xtmBRtDJFL7LqZqcoK7rdGrsoySo=";
|
||||
x86_64-linux = "sha256-sDzwEhoPEfa21zBwD0IYoRdz4VHeTSUL0biHbbWE+Dc=";
|
||||
aarch64-linux = "sha256-sfnRzY+1flUdIM1ey9u00j9eiDa4u5bY/f3fupV+FKM=";
|
||||
armv7l-linux = "sha256-ZnFSJE1VmvqSKZHBsMtvBbypsbY35z9X5T4bYT0DytU=";
|
||||
x86_64-linux = "sha256-lgZjVVBWPloqMWX0oryNB0lxgmJCBqC7pp0AjeUMjQM=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sacad";
|
||||
version = "2.8.1";
|
||||
version = "2.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WHxZZrKPTsTaIJGxD7ZUYQNz9ua024MXoflEVGNE9Jc=";
|
||||
hash = "sha256-6bKxFOP4hPbU5d1J/wro1BM/Bh9W//QzcZ4YbfaaqYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snapraid";
|
||||
version = "12.4";
|
||||
version = "13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amadvance";
|
||||
repo = "snapraid";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7guTRH9AZCsQYyWLpws19/sEe9GVFop21GYPzXCK6Fg=";
|
||||
hash = "sha256-IoK37ZXlMRLDPjzsLUqcfcu4asdstFJYgHc2wAg9lno=";
|
||||
};
|
||||
|
||||
VERSION = finalAttrs.version;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ssocr";
|
||||
version = "2.25.0";
|
||||
version = "2.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auerswal";
|
||||
repo = "ssocr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-yQPjs4kGvp6C7kFcWQ3EzoFhwEAhm2nC7yXu9RbU4os=";
|
||||
hash = "sha256-GRjUCE4l/IIAqV+W2s/+HaGMKqfSTmEQeW28o4Gkw/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -20,16 +20,16 @@ let
|
||||
television = rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "television";
|
||||
|
||||
version = "0.14.5";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexpasmantier";
|
||||
repo = "television";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Oa/5f8FQ0WIAWNviiL2OZ+mmac6xUqp0C7ixmU6nt6Q=";
|
||||
hash = "sha256-WjIvsLO+LIDNEx2fEn0oe6YwrQYMhmRqWTomIoSH3Co=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rKokOLm2IcUyHiQz+PwmdnpdGTGen2U4iqcY4wsTQl4=";
|
||||
cargoHash = "sha256-AI7B4z8C+q3xcaB+BpPb0IIyZeDpWxx2qZVWPJkG/sY=";
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "texturepacker";
|
||||
version = "7.9.0";
|
||||
version = "7.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb";
|
||||
hash = "sha256-o613XN8/ypmOEWyDjIQeF6JQsZK5gyDsgmYwd9siU1k=";
|
||||
hash = "sha256-s0d9kcsvW3r6kkz5qIxYDtIMD2Kzqz/tCSWvwxeJFnE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
libpcap,
|
||||
openssl,
|
||||
libnetfilter_queue,
|
||||
@@ -18,6 +19,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-15 build failure:
|
||||
# https://github.com/vanhauser-thc/thc-ipv6/pull/53
|
||||
(fetchpatch {
|
||||
name = "gcc-15.patch";
|
||||
url = "https://github.com/vanhauser-thc/thc-ipv6/commit/c9617d5638196bd88336225a6abdfd45c3df0bcf.patch";
|
||||
hash = "sha256-4+LmRsDInzzNFHvj8WK+r1fKeoLggQW7yrahC1d6WCs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
openssl
|
||||
@@ -29,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "IPv6 attack toolkit";
|
||||
homepage = "https://github.com/vanhauser-thc/thc-ipv6";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vsmartcard-vpcd";
|
||||
version = "0.9-unstable-2025-01-25";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frankmorgner";
|
||||
repo = "vsmartcard";
|
||||
rev = "7369dae26bcb709845003ae2128b8db9df7031ae";
|
||||
hash = "sha256-mfw/Yv12ceBVZIyAKJqBh+w4otj3rYYZbJUjKRLcsr4=";
|
||||
tag = "virtualsmartcard-${finalAttrs.version}";
|
||||
hash = "sha256-+BrX2aqByUvIUbN4K+sdq9bH29FD2rtTt4q+URPgx7A=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/virtualsmartcard";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wabt";
|
||||
version = "1.0.37";
|
||||
version = "1.0.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "wabt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ejr+FxaYRDI01apHhKTs11iwcv72a8ZxyPmVetEvadU=";
|
||||
hash = "sha256-Hwfk0wQ8Oz1XI/hIzVy0G+/FyWl+iiGYoFrgLbm27Tk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "x42-gmsynth";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x42";
|
||||
repo = "gmsynth.lv2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Fu/wCQY5fTvAWo18hhiQC9LZAUwi3WJfhgWLI0rgmKs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-js7c8d+yOjrRBs/xtHNfhXAcbiPX1PKFjHsThtEgzPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xchm";
|
||||
version = "1.37";
|
||||
version = "1.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rzvncj";
|
||||
repo = "xCHM";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-UMn8ds4nheuYSu0PesxdGoyxyn5AcKq9WByeRUxxx3k=";
|
||||
sha256 = "sha256-ZZ3cTUCeXbQSDF2ioMsmZYy6jLnQPw5C3KP+wYSvmVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
gitUpdater,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "xpra-html5";
|
||||
pname = "xpra-html5";
|
||||
version = "17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -43,13 +43,13 @@ assert (
|
||||
);
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "xremap${variant.suffix or ""}";
|
||||
version = "0.14.10";
|
||||
version = "0.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xremap";
|
||||
repo = "xremap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2wylBk3+Zu1pHa41dhKwvUtxOVyHSMRDfOD9fIp8x2I=";
|
||||
hash = "sha256-UNiyUujijIAsEvCRuMZ1MVNwoY/v5Sbo3/2r8vdA6HM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = variant.features;
|
||||
|
||||
cargoHash = "sha256-S9mevRDGx23mquABVH/cC1zKNxW1607mS/vaRxRqKfk=";
|
||||
cargoHash = "sha256-roa2Akc1XuSGGkBK++qYvmTgVwzA5xNlrf0TdTUoEdM=";
|
||||
|
||||
passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
hash = "sha256-/6x2HhwW0+A7/CYC+HUCsJ2u1tp4zno6XjpvBLogUKU=";
|
||||
hash = "sha256-ubATPd2cbtmzNTSTCsj52GQZncdwaxX6Chc9FSHrOxY=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
|
||||
@@ -497,6 +497,12 @@ stdenv.mkDerivation (
|
||||
hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ=";
|
||||
})
|
||||
]
|
||||
++ optionals (lib.versionAtLeast version "7.1.1" && lib.versionOlder version "7.1.3") [
|
||||
(fetchpatch2 {
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d8ffec5bf9a2803f55cc0822a97b7815f24bee83";
|
||||
hash = "sha256-lmSI5arShb2/W84FMnSNs3lb6rd5vWdUSzfU8oza0Ic=";
|
||||
})
|
||||
]
|
||||
++ optionals (lib.versionOlder version "7.1.2") [
|
||||
(fetchpatch2 {
|
||||
name = "unbreak-svt-av1-3.0.0.patch";
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-sdk";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "sdk==${version}";
|
||||
hash = "sha256-PGQjIxdd4aDh2t9p1gttMlREBxqMOR9Ghtb10wL0gBI=";
|
||||
hash = "sha256-nhx/0qSdS8itk6jY/NR8iQCUNkk/LBDlGzEGddIXxLs=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/sdk-py";
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchPypi,
|
||||
buildPythonPackage,
|
||||
pythonAtLeast,
|
||||
dnspython,
|
||||
pyasn1,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sleekxmpp";
|
||||
version = "1.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonAtLeast "3.10"; # Deprecated in favor of Slixmpp
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dnspython
|
||||
pyasn1
|
||||
];
|
||||
|
||||
patches = [ ./dnspython-ip6.patch ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d213c1de71d92505f95ced0460ee0f84fdc4ddcacb7d7dd343739ed4028e5569";
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken =
|
||||
(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin;
|
||||
description = "XMPP library for Python";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "http://sleekxmpp.com/";
|
||||
};
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
--- a/sleekxmpp/xmlstream/resolver.py
|
||||
+++ b/sleekxmpp/xmlstream/resolver.py
|
||||
@@ -175,6 +175,9 @@ def get_A(host, resolver=None, use_dnspy
|
||||
"""
|
||||
log.debug("DNS: Querying %s for A records." % host)
|
||||
|
||||
+ if isinstance(host, bytes):
|
||||
+ host = host.decode("utf-8")
|
||||
+
|
||||
# If not using dnspython, attempt lookup using the OS level
|
||||
# getaddrinfo() method.
|
||||
if resolver is None or not use_dnspython:
|
||||
@@ -189,7 +192,10 @@ def get_A(host, resolver=None, use_dnspy
|
||||
# Using dnspython:
|
||||
try:
|
||||
recs = resolver.query(host, dns.rdatatype.A)
|
||||
- return [rec.to_text() for rec in recs]
|
||||
+ if isinstance(recs[0].to_text(), bytes):
|
||||
+ return [rec.to_text().decode("utf-8") for rec in recs]
|
||||
+ else:
|
||||
+ return [rec.to_text() for rec in recs]
|
||||
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
|
||||
log.debug("DNS: No A records for %s" % host)
|
||||
return []
|
||||
@@ -222,6 +228,9 @@ def get_AAAA(host, resolver=None, use_dn
|
||||
"""
|
||||
log.debug("DNS: Querying %s for AAAA records." % host)
|
||||
|
||||
+ if isinstance(host, bytes):
|
||||
+ host = host.decode("utf-8")
|
||||
+
|
||||
# If not using dnspython, attempt lookup using the OS level
|
||||
# getaddrinfo() method.
|
||||
if resolver is None or not use_dnspython:
|
||||
@@ -240,7 +249,10 @@ def get_AAAA(host, resolver=None, use_dn
|
||||
# Using dnspython:
|
||||
try:
|
||||
recs = resolver.query(host, dns.rdatatype.AAAA)
|
||||
- return [rec.to_text() for rec in recs]
|
||||
+ if isinstance(recs[0].to_text(), bytes):
|
||||
+ return [rec.to_text().decode("utf-8") for rec in recs]
|
||||
+ else:
|
||||
+ return [rec.to_text() for rec in recs]
|
||||
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
|
||||
log.debug("DNS: No AAAA records for %s" % host)
|
||||
return []
|
||||
@@ -324,6 +336,8 @@ def get_SRV(host, port, service, proto='
|
||||
if running_sum >= selected:
|
||||
rec = sums[running_sum]
|
||||
host = rec.target.to_text()
|
||||
+ if isinstance(host, bytes):
|
||||
+ host = host.decode("utf-8")
|
||||
if host.endswith('.'):
|
||||
host = host[:-1]
|
||||
sorted_recs.append((host, rec.port))
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -41,6 +42,9 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# RuntimeError: torch.compile is not supported on Python 3.14+
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.14") [ "test_up" ];
|
||||
|
||||
pythonImportsCheck = [ "x_transformers" ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,6 +6,95 @@
|
||||
}:
|
||||
|
||||
lib.makeOverridable (
|
||||
/**
|
||||
Creates a wrapped fish shell binary with some plugins, completions,
|
||||
configuration snippets and functions sourced from the function
|
||||
arguments.
|
||||
|
||||
This can for example be used as a convenient way to test fish plugins
|
||||
and scripts without having to alter the environment.
|
||||
|
||||
# Type
|
||||
|
||||
```pseudocode
|
||||
wrapFish :: {
|
||||
completionDirs :: [Path] ?,
|
||||
functionDirs :: [Path] ?,
|
||||
confDirs :: [Path] ?,
|
||||
pluginPkgs :: [Derivation] ?,
|
||||
localConfig :: String ?,
|
||||
shellAliases :: {
|
||||
[ N :: T ] :: String
|
||||
} ?,
|
||||
runtimeInputs :: [Derivation] ?,
|
||||
} -> Derivation
|
||||
```
|
||||
|
||||
# Example
|
||||
|
||||
::: {.example}
|
||||
```nix
|
||||
wrapFish {
|
||||
pluginPkgs = with fishPlugins; [
|
||||
pure
|
||||
foreign-env
|
||||
];
|
||||
completionDirs = [ ];
|
||||
functionDirs = [ ];
|
||||
confDirs = [ "/path/to/some/fish/init/dir/" ];
|
||||
shellAliases = {
|
||||
hello = "echo 'Hello World!'";
|
||||
bye = "echo 'Bye World!'; exit";
|
||||
};
|
||||
runtimeInputs = with pkgs; [
|
||||
curl
|
||||
w3m
|
||||
];
|
||||
}
|
||||
```
|
||||
:::
|
||||
|
||||
# Arguments
|
||||
|
||||
All arguments are optional.
|
||||
|
||||
## `completionDirs` (list of paths)
|
||||
|
||||
Directories containing fish completions which will be prepended to
|
||||
{env}`fish_complete_paths` in the environment of the resulting wrapped
|
||||
fish binary.
|
||||
|
||||
## `functionDirs` (list of paths)
|
||||
|
||||
Directories containing fish functions which will be prepended to
|
||||
{env}`fish_function_path` in the environment of the resulting wrapped
|
||||
fish binary.
|
||||
|
||||
## `confDirs` (list of paths)
|
||||
|
||||
Directories containing fish code which will be sourced by the resulting
|
||||
wrapped fish binary.
|
||||
|
||||
## `pluginPkgs` (list of derivations)
|
||||
|
||||
Derivations, usually from the package set `fishPlugins`, that will be
|
||||
added to the resulting wrapped fish binary.
|
||||
|
||||
## `localConfig` (string)
|
||||
|
||||
String containing a fish script which will be sourced by the resulting
|
||||
wrapped fish binary.
|
||||
|
||||
## `shellAliases` (attribute set of strings)
|
||||
|
||||
Shell aliases that will be made available in the resulting wrapped fish
|
||||
binary.
|
||||
|
||||
## `runtimeInputs` (list of derivations)
|
||||
|
||||
A list of Derivations that will be added to the {env}`PATH` of the
|
||||
resulting wrapped fish binary.
|
||||
*/
|
||||
{
|
||||
completionDirs ? [ ],
|
||||
functionDirs ? [ ],
|
||||
|
||||
@@ -476,6 +476,7 @@ mapAliases {
|
||||
sip_4 = throw "'sip_4' has been renamed to/replaced by 'sip4'"; # Converted to throw 2025-10-29
|
||||
sipsimple = lib.warnOnInstantiate "'sipsimple' has been renamed to 'python3-sipsimple' to fit upstream naming" python3-sipsimple; # added 2026-01-05
|
||||
slackclient = throw "'slackclient' has been renamed to/replaced by 'slack-sdk'"; # Converted to throw 2025-10-29
|
||||
sleekxmpp = throw "'sleekxmpp' has been removed because it was deprecated in favor of 'slixmpp'"; # added 2026-01-19
|
||||
smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2025-10-29
|
||||
smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29
|
||||
sorl_thumbnail = throw "'sorl_thumbnail' has been renamed to/replaced by 'sorl-thumbnail'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -17523,8 +17523,6 @@ self: super: with self; {
|
||||
|
||||
slapd = callPackage ../development/python-modules/slapd { };
|
||||
|
||||
sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };
|
||||
|
||||
sleekxmppfs = callPackage ../development/python-modules/sleekxmppfs { };
|
||||
|
||||
sleepyq = callPackage ../development/python-modules/sleepyq { };
|
||||
|
||||
Reference in New Issue
Block a user