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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-11-02 06:07:21 +00:00
committed by GitHub
parent 1295302c28 6a8176d2a1
commit be0e8bd8b4
29 changed files with 200 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/network-filesystems/kubo.nix
+6 -8
View File
@@ -167,7 +167,7 @@ in
autoMigrate = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Whether Kubo should try to run the fs-repo-migration at startup.";
description = "Whether Kubo should try to migrate its filesystem repository automatically.";
};
enableGC = lib.mkOption {
@@ -330,8 +330,8 @@ in
environment.variables.IPFS_PATH = fakeKuboRepo;
# https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000;
boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000;
boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;
boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;
programs.fuse = lib.mkIf cfg.autoMount {
userAllowOther = true;
@@ -344,9 +344,6 @@ in
createHome = false;
uid = config.ids.uids.ipfs;
description = "IPFS daemon user";
packages = [
pkgs.kubo-migrator
];
};
};
@@ -377,6 +374,7 @@ in
path = [
"/run/wrappers"
cfg.package
pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...'
];
environment.IPFS_PATH = cfg.dataDir;
@@ -388,7 +386,7 @@ in
rm -vf "$IPFS_PATH/api"
''
+ lib.optionalString cfg.autoMigrate ''
'${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
'${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade
''
+ ''
fi
@@ -412,7 +410,7 @@ in
serviceConfig = {
ExecStart = [
""
"${cfg.package}/bin/ipfs daemon ${kuboFlags}"
"${lib.getExe cfg.package} daemon ${kuboFlags}"
];
User = cfg.user;
Group = cfg.group;
nixos/modules/services/networking/searx.nix
+22 -8
View File
@@ -13,7 +13,9 @@ let
cfg = config.services.searx;
settingsFile = pkgs.writeText "settings.yml" (builtins.toJSON cfg.settings);
settingsFile = pkgs.writeText "settings.yml" (
builtins.toJSON (builtins.removeAttrs cfg.settings [ "redis" ])
);
faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;
limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
@@ -79,12 +81,22 @@ in
};
settings = mkOption {
type = types.submodule {
freeformType = settingType;
imports = [
(mkRenamedOptionModule [ "redis" ] [ "valkey" ])
];
};
type = types.submodule (
{ config, ... }:
{
options = {
valkey = lib.mkOption {
internal = true;
default = { };
};
};
config.valkey = lib.mkIf (config ? redis) (
lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis
);
freeformType = settingType;
}
);
default = { };
example = literalExpression ''
{
@@ -287,7 +299,9 @@ in
]
)) "s"
}://${cfg.domain}/";
valkey.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}";
valkey = lib.mkIf cfg.redisCreateLocally {
url = "unix://${config.services.redis.servers.searx.unixSocket}";
};
};
};
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -63,13 +63,13 @@
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
"auth0_auth0": {
"hash": "sha256-59GW5hWNTWc1OyoEuHLSRRw5HFYfTV+Tp6vB5Jj5Gtw=",
"hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v1.32.0",
"rev": "v1.33.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-z0YJIZ3PSZany4acKYOIP575qg8iaBJcDhlhzr+RptU="
"vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c="
},
"aviatrixsystems_aviatrix": {
"hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",
pkgs/by-name/_1/_1password-gui/sources.json
+10 -10
View File
@@ -1,28 +1,28 @@
{
"stable": {
"linux": {
"version": "8.11.14",
"version": "8.11.16",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",
"hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",
"hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",
"hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",
"hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="
}
}
},
"darwin": {
"version": "8.11.14",
"version": "8.11.16",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",
"hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="
"url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",
"hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",
"hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="
"url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",
"hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="
}
}
}
pkgs/by-name/bl/blur-effect/package.nix
+11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
pkg-config,
cmake,
gdk-pixbuf,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
};
patches = [
# Pull cmake-4 fix:
# https://github.com/sonald/blur-effect/pull/7
(fetchpatch {
name = "cmake-4.patch";
url = "https://github.com/sonald/blur-effect/commit/76322ad8bd0e653726a6791eb8ebcc829cbb1b38.patch?full_index=1";
hash = "sha256-f0PBhfdrcLCZBzYx+j8+qIG9boW3S4CSyz+bS9vFKRc=";
})
];
nativeBuildInputs = [
pkg-config
cmake
pkgs/applications/misc/fetchmail/default.nix → pkgs/by-name/fe/fetchmail/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.5.7";
version = "6.6.0";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw=";
};
buildInputs = [
pkgs/applications/misc/fetchmail/v7.nix → pkgs/by-name/fe/fetchmail_7/package.nix
View File
pkgs/by-name/fn/fna3d/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "fna3d";
version = "25.10";
version = "25.11";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FNA3D";
tag = version;
fetchSubmodules = true;
hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw=";
hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk=";
};
cmakeFlags = [
pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
+2 -1
View File
@@ -258,7 +258,8 @@ symlinkJoin {
longDescription = ''
This package contains all the individual migrations in the bin directory.
This is used by fs-repo-migrations and could also be used by Kubo itself
when starting it like this: ipfs daemon --migrate
when starting it like this: `ipfs daemon --migrate`
or when calling `ipfs repo migrate --to=16`.
'';
};
}
pkgs/by-name/ku/kubo/package.nix
+3 -3
View File
@@ -8,15 +8,15 @@
buildGoModule rec {
pname = "kubo";
version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below
version = "0.38.2"; # When updating, also check if the repo version changed and adjust repoVersion below
rev = "v${version}";
passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version
passthru.repoVersion = "18";
# Kubo makes changes to its source tarball that don't match the git source.
src = fetchurl {
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
hash = "sha256-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw=";
hash = "sha256-A02edHUZoU2oQk4OyCmc/wMfk3k+EWkdO2RxPGlUrXg=";
};
# tarball contains multiple files/directories
pkgs/by-name/me/memos/package.nix
+7 -7
View File
@@ -14,17 +14,17 @@
protoc-gen-validate,
}:
let
version = "0.25.1";
version = "0.25.2";
src = fetchFromGitHub {
owner = "usememos";
repo = "memos";
rev = "v${version}";
hash = "sha256-5CeeOpdXs+6Vus4er8JVhJM0a7BKtGsF4SPdOoX5xQk=";
hash = "sha256-Yag+OxhlWEhWumnB620QREm4G99osKzQNlGN+1YBMTQ=";
};
memos-protobuf-gen = stdenvNoCC.mkDerivation {
name = "memos-protobuf-gen";
inherit src;
pname = "memos-protobuf-gen";
inherit version src;
nativeBuildInputs = [
buf
@@ -52,7 +52,7 @@ let
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-BOBnNcBp/vjTaS7N1z5kRWZoKokJXEMNs5rS32ZBtKU=";
outputHash = "sha256-j9jBxhDi1COowOh5sDjOuVJdHf2/RSwZ0cQUD/j2jt0=";
};
memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -62,7 +62,7 @@ let
inherit (finalAttrs) pname version src;
sourceRoot = "${finalAttrs.src.name}/web";
fetcherVersion = 1;
hash = "sha256-qY3jPbdEy+lWoBV/xKNTGQ58xvcoBoG0vPwN5f9+wj4=";
hash = "sha256-qvxOY7ASAlYbT5Ju/8b3qiE9KgXkDIj1MZuVH0hmCOA=";
};
pnpmRoot = "web";
nativeBuildInputs = [
@@ -93,7 +93,7 @@ buildGoModule {
memos-protobuf-gen
;
vendorHash = "sha256-+v2OElo2ZC0OEhNsNe23J0PR0y1opm/HckW+vUmJ8e4=";
vendorHash = "sha256-Eihp7Kcu8AiPL2VEypxx8+8JwjHI8htoOv69xGrp560=";
preBuild = ''
rm -rf server/router/frontend/dist
pkgs/by-name/nz/nzbget/package.nix
+2 -2
View File
@@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "nzbget";
version = "25.3";
version = "25.4";
src = fetchFromGitHub {
owner = "nzbgetcom";
repo = "nzbget";
rev = "v${finalAttrs.version}";
hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU=";
hash = "sha256-BP2kNgEDLVpW4TvUW2dToa3rnvGANZw2alBO75Jd2hs=";
};
patches = [
pkgs/by-name/se/searxng/package.nix
+3 -3
View File
@@ -13,14 +13,14 @@ in
python.pkgs.toPythonModule (
python.pkgs.buildPythonApplication rec {
pname = "searxng";
version = "0-unstable-2025-10-23";
version = "0-unstable-2025-10-31";
pyproject = true;
src = fetchFromGitHub {
owner = "searxng";
repo = "searxng";
rev = "e363db970c77e9cab8f3611bb6b6f8a59646a035";
hash = "sha256-phJRQ+euSTEmsn1wS5dgO8UPwAJ8cr8ov3K3fSzWQVA=";
rev = "b8e4ebdc0cd3b6dc5f58d8ff54deced2b14b13b1";
hash = "sha256-qx4y79utIVyLWQlF/RN1TzHKCM/EMDv7tR9WGEbaYoQ=";
};
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
pkgs/by-name/to/topgrade/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "16.0.4";
version = "16.1.2";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
hash = "sha256-b/xzmC49ETGtcf9ekrSkq75cKxSL4ZrvKPkparwz6zU=";
hash = "sha256-oDIEvBM7TDJlnkZSHkbtIUGRJ+RK48u9S4tuMeKSwO0=";
};
cargoHash = "sha256-d6jX+3ZcCswhKy5SsSpvXZL9el70+OyIa7lYQ3B/o8M=";
cargoHash = "sha256-9jfKnjCbxo47qUWYdqBHoObxth3pporRZ0oauCkWwkc=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/vg/vgmstream/package.nix
+43 -39
View File
@@ -13,51 +13,26 @@
libao,
speex,
nix-update-script,
audaciousSupport ? stdenv.hostPlatform.isLinux,
}:
let
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
atrac9-src = fetchFromGitHub {
owner = "Thealexbarney";
repo = "LibAtrac9";
rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
};
assert lib.assertMsg (
audaciousSupport -> stdenv.hostPlatform.isLinux
) "Only Linux supports building the Audacious plugin.";
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
celt-0_6_1-src = fetchzip {
url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
};
celt-0_11_0-src = fetchzip {
url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
};
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "vgmstream";
version = "2055";
src = fetchFromGitHub {
owner = "vgmstream";
repo = "vgmstream";
tag = "r${version}";
tag = "r${finalAttrs.version}";
hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU=";
};
passthru.updateScript = nix-update-script {
attrPath = "vgmstream";
extraArgs = [
"--version-regex"
"r(.*)"
];
};
outputs = [
"out"
"audacious"
];
outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
nativeBuildInputs = [
cmake
@@ -71,8 +46,8 @@ stdenv.mkDerivation rec {
libvorbis
libao
speex
audacious-bare
];
]
++ lib.optional audaciousSupport audacious-bare;
preConfigure = ''
substituteInPlace cmake/dependencies/audacious.cmake \
@@ -83,20 +58,49 @@ stdenv.mkDerivation rec {
# Therefore, CELT_0110_PATH needs to point to a mutable directory.
lib.optionalString (stdenv.system == "x86_64-linux") ''
mkdir -p dependencies/celt-0.11.0/
cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
cp -r ${finalAttrs.passthru.sources.celt-0_11_0-src}/* dependencies/celt-0.11.0/
chmod -R +w dependencies/celt-0.11.0/
'';
cmakeFlags = [
"-DATRAC9_PATH=${atrac9-src}"
"-DATRAC9_PATH=${finalAttrs.passthru.sources.atrac9-src}"
(lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport)
]
# Only supported on x86_64-linux
++ lib.optionals (stdenv.system == "x86_64-linux") [
"-DCELT_0061_PATH=${celt-0_6_1-src}"
"-DCELT_0061_PATH=${finalAttrs.passthru.sources.celt-0_6_1-src}"
"-DCELT_0110_PATH=../dependencies/celt-0.11.0"
# libg719_decode omitted because it doesn't have a free software license
];
passthru = {
updateScript = nix-update-script {
attrPath = "vgmstream";
extraArgs = [
"--version-regex"
"r(.*)"
];
};
sources = {
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
atrac9-src = fetchFromGitHub {
owner = "Thealexbarney";
repo = "LibAtrac9";
rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
};
# https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
celt-0_6_1-src = fetchzip {
url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
};
celt-0_11_0-src = fetchzip {
url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
};
};
};
meta = with lib; {
description = "Library for playback of various streamed audio formats used in video games";
homepage = "https://vgmstream.org";
@@ -110,4 +114,4 @@ stdenv.mkDerivation rec {
++ optional (stdenv.system == "x86_64-linux") bsd2;
platforms = with platforms; unix;
};
}
})
pkgs/by-name/xa/xapp/package.nix
+4
View File
@@ -96,6 +96,10 @@ stdenv.mkDerivation rec {
# Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
preFixup = ''
wrapGApp $out/lib/xapps/xapp-sn-watcher
'';
meta = with lib; {
homepage = "https://github.com/linuxmint/xapp";
description = "Cross-desktop libraries and common resources";
pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+2 -1
View File
@@ -11,8 +11,8 @@
gtk3,
gsettings-desktop-schemas,
mate,
xdg-desktop-portal,
xapp,
xdg-desktop-portal,
}:
stdenv.mkDerivation rec {
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
gtk3
gsettings-desktop-schemas # org.gnome.system.location
mate.mate-desktop # org.mate.background
xapp # org.x.apps.portal
xdg-desktop-portal
];
pkgs/by-name/xr/xremap/package.nix
+3 -3
View File
@@ -43,13 +43,13 @@ assert (
);
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xremap${variant.suffix or ""}";
version = "0.14.2";
version = "0.14.3";
src = fetchFromGitHub {
owner = "xremap";
repo = "xremap";
tag = "v${finalAttrs.version}";
hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
hash = "sha256-UHkwTz5KEDAqXKpN/YVzY0xP7b6nN8WkPilzpF8YU3A=";
};
nativeBuildInputs = [ pkg-config ];
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildNoDefaultFeatures = true;
buildFeatures = variant.features;
cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
cargoHash = "sha256-ucyBQPCskHwz8rYzOULJ3enL6rhvpLxJzS7sTNwuBW4=";
passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
pkgs/development/python-modules/bitsandbytes/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
let
pname = "bitsandbytes";
version = "0.48.1";
version = "0.48.2";
brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) {
"CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport;
@@ -78,7 +78,7 @@ buildPythonPackage {
owner = "bitsandbytes-foundation";
repo = "bitsandbytes";
tag = version;
hash = "sha256-OkhWv5Mb/cnWJteCXvDEkWQvK+QK26YQex39yWIezrQ=";
hash = "sha256-gtNOMxLeYTCZK5MVdpjOFOw6rxvqS+XJmY1Meiuz0Rw=";
};
patches = [
pkgs/development/python-modules/temporalio/default.nix
+2 -2
View File
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "temporalio";
version = "1.18.1";
version = "1.18.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "temporalio";
repo = "sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-53UDG6eN7Jv8nUUh84I1SX9Gc+gZK66o6e4pqe9aWq4=";
hash = "sha256-EUys/UMblFVzICvMZmcGUXAqmtjPOdJKgtIx5TFB/9U=";
fetchSubmodules = true;
};
pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
grafanaPlugin {
pname = "victoriametrics-metrics-datasource";
version = "0.19.4";
zipHash = "sha256-gpbBPyzWWiz9cENBWEHyDqBRMXypiEDDgdYFuQnsD5o=";
version = "0.19.5";
zipHash = "sha256-wKLtfCI/onYPFrtP1EUrCbZ+OCHicshRZkZtltH6LzI=";
meta = {
description = "VictoriaMetrics metrics datasource for Grafana";
license = lib.licenses.agpl3Only;
pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+9 -5
View File
@@ -8,10 +8,12 @@
fish,
getconf,
makeWrapper,
nushell,
zsh,
}:
let
cleanArgs = lib.flip removeAttrs [
"name"
"dependencies"
"meta"
];
@@ -26,6 +28,7 @@ stdenv.mkDerivation (
finalAttrs:
cleanArgs args
// {
pname = name;
inherit (core) version;
src = core;
@@ -35,24 +38,25 @@ stdenv.mkDerivation (
buildInputs = dependencies;
# Patch shebangs now because our tests rely on them
postPatch = ''
postPatch = (args.postPatch or "") + ''
patchShebangs --host bin/${name}
'';
dontConfigure = true;
dontBuild = true; # we've already built
dontBuild = true; # we've already built it
doCheck = true;
doCheck = args.doCheck or true;
nativeCheckInputs = [
bat
bash
fish
nushell
zsh
]
++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
checkPhase = ''
runHook preCheck
bash ./test.sh --compiled --suite ${name}
bash ./test.sh --compiled --suite ${name} --verbose --snapshot:show
runHook postCheck
'';
@@ -69,7 +73,7 @@ stdenv.mkDerivation (
runHook postInstall
'';
# We already patched
# We have already patched
dontPatchShebangs = true;
meta = core.meta // { mainProgram = name; } // meta;
pkgs/tools/misc/bat-extras/modules/batgrep.nix
+3
View File
@@ -11,5 +11,8 @@ buildBatExtrasPkg {
coreutils
ripgrep
];
# The tests are broken with the new bat 0.26.0
# https://github.com/eth-p/bat-extras/issues/143
doCheck = false;
meta.description = "Quickly search through and highlight files using ripgrep";
}
pkgs/tools/misc/bat-extras/modules/batpipe.nix
+15 -1
View File
@@ -1,9 +1,23 @@
{
lib,
stdenv,
buildBatExtrasPkg,
less,
procps,
}:
buildBatExtrasPkg {
name = "batpipe";
dependencies = [ less ];
dependencies = [
less
procps
];
patches = [
../patches/batpipe-skip-outdated-test.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
../patches/batpipe-skip-detection-tests.patch
];
meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal";
}
pkgs/tools/misc/bat-extras/modules/core.nix
+7 -7
View File
@@ -7,17 +7,18 @@
fish,
getconf,
nix-update-script,
nushell,
zsh,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "bat-extras";
version = "2024.08.24";
version = "2024.08.24-unstable-2025-02-22";
src = fetchFromGitHub {
owner = "eth-p";
repo = "bat-extras";
tag = "v${version}";
hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8=";
rev = "3860f0f1481f1d0e117392030f55ef19cc018ee4";
hash = "sha256-9TEq/LzE1Pty1Z3WFWR/TaNNKPp2LGBr0jzGBkOEGQo=";
fetchSubmodules = true;
};
@@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
dontConfigure = true;
patches = [ ../patches/disable-theme-tests.patch ];
postPatch = ''
patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
'';
@@ -43,6 +42,7 @@ stdenv.mkDerivation rec {
nativeCheckInputs = [
bash
fish
nushell
zsh
]
++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
# The per-script derivations will go ahead and patch the files they actually install.
dontPatchShebangs = true;
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Bash scripts that integrate bat with various command line tools";
pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch
+20
View File
@@ -0,0 +1,20 @@
diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
index e834f6e..da87411 100644
--- a/test/suite/batpipe.sh
+++ b/test/suite/batpipe.sh
@@ -12,6 +12,7 @@ test:detected_bash_shell() {
test:detected_fish_shell() {
description "Test it can detect a fish shell."
+ skip "This test fails in the Nix sandbox"
# Note: We don't use bash's `-c` option when testing with a fake fish shell.
# Bash `-c` will automatically exec() into the last process, which loses the
@@ -28,6 +29,7 @@ test:detected_fish_shell() {
test:detected_nu_shell() {
description "Test it can detect a nushell shell."
+ skip "This test fails in the Nix sandbox"
# Note: We don't use bash's `-c` option when testing with a fake nu shell.
# Bash `-c` will automatically exec() into the last process, which loses the
pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
index e834f6e..2d9354d 100644
--- a/test/suite/batpipe.sh
+++ b/test/suite/batpipe.sh
@@ -51,6 +51,7 @@ test:viewer_gzip() {
test:batpipe_term_width() {
description "Test support for BATPIPE_TERM_WIDTH"
+ skip "Fails on a newer version of bat"
snapshot STDOUT
export BATPIPE=color
pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
-42
View File
@@ -1,42 +0,0 @@
Subject: [PATCH] skip tests depending on color theme
===================================================================
diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
--- a/test/suite/batpipe.sh (revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
+++ b/test/suite/batpipe.sh (date 1736621098865)
@@ -29,6 +29,7 @@
test:batpipe_term_width() {
description "Test support for BATPIPE_TERM_WIDTH"
snapshot STDOUT
+ skip "bat-extras does not support `--theme` flag"
export BATPIPE=color
export BATPIPE_DEBUG_PARENT_EXECUTABLE=less
Index: test/suite/batgrep.sh
===================================================================
diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
--- a/test/suite/batgrep.sh (revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
+++ b/test/suite/batgrep.sh (date 1736621086239)
@@ -58,6 +58,7 @@
description "Snapshot test for colored output."
snapshot stdout
snapshot stderr
+ skip "bat-extras does not support `--theme` flag"
require_rg
@@ -118,6 +119,7 @@
description "Should respect the BAT_STYLE variable."
snapshot stdout
snapshot stderr
+ skip "bat-extras does not support `--theme` flag"
require_rg
@@ -128,6 +130,7 @@
description "Snapshot test for output without separator"
snapshot stdout
snapshot stderr
+ skip "bat-extras does not support `--theme` flag"
require_rg
pkgs/top-level/all-packages.nix
-3
View File
@@ -10951,9 +10951,6 @@ with pkgs;
];
};
fetchmail = callPackage ../applications/misc/fetchmail { };
fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
firewalld-gui = firewalld.override { withGui = true; };
fldigi = callPackage ../applications/radio/fldigi {