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-06-20 06:06:15 +00:00
committed by GitHub
parent f61b8db0f0 63bd3100b8
commit b6221f6d8e
68 changed files with 2086 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -24957,6 +24957,12 @@
githubId = 71843723;
keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D A75C BDD5 7BE9 9D55 5965"; } ];
};
theonlymrcat = {
name = "Max Guppy";
email = "theonly@mrcat.au";
github = "TheOnlyMrCat";
githubId = 23222857;
};
theoparis = {
email = "theo@tinted.dev";
github = "theoparis";
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix
+10
View File
@@ -24,6 +24,16 @@
pkgs.maliit-keyboard
];
environment.plasma6.excludePackages = [
# Optional wallpapers that add 126 MiB to the graphical installer
# closure. They will still need to be downloaded when installing a
# Plasma system, though.
pkgs.kdePackages.plasma-workspace-wallpapers
];
# Avoid bundling an entire MariaDB installation on the ISO.
programs.kde-pim.enable = false;
system.activationScripts.installerDesktop =
let
nixos/modules/services/desktop-managers/cosmic.nix
+2
View File
@@ -13,6 +13,7 @@
let
cfg = config.services.desktopManager.cosmic;
notExcluded = pkg: utils.disablePackageByName pkg config.environment.cosmic.excludePackages;
excludedCorePkgs = lib.lists.intersectLists corePkgs config.environment.cosmic.excludePackages;
# **ONLY ADD PACKAGES WITHOUT WHICH COSMIC CRASHES, NOTHING ELSE**
corePkgs =
@@ -162,6 +163,7 @@ in
services.avahi.enable = lib.mkDefault true;
services.gnome.gnome-keyring.enable = lib.mkDefault true;
services.gvfs.enable = lib.mkDefault true;
services.orca.enable = lib.mkDefault (notExcluded pkgs.orca);
services.power-profiles-daemon.enable = lib.mkDefault (
!config.hardware.system76.power-daemon.enable
);
nixos/modules/services/desktop-managers/plasma6.nix
+1 -1
View File
@@ -136,7 +136,6 @@ in
breeze-icons
breeze-gtk
ocean-sound-theme
plasma-workspace-wallpapers
pkgs.hicolor-icon-theme # fallback icons
qqc2-breeze-style
qqc2-desktop-style
@@ -158,6 +157,7 @@ in
[
aurorae
plasma-browser-integration
plasma-workspace-wallpapers
konsole
kwin-x11
(lib.getBin qttools) # Expose qdbus in PATH
nixos/tests/all-tests.nix
+8 -1
View File
@@ -247,7 +247,14 @@ in
_module.args.compression = "xz";
};
bind = runTest ./bind.nix;
bird = handleTest ./bird.nix { };
bird2 = import ./bird.nix {
inherit runTest;
package = pkgs.bird2;
};
bird3 = import ./bird.nix {
inherit runTest;
package = pkgs.bird3;
};
birdwatcher = handleTest ./birdwatcher.nix { };
bitbox-bridge = runTest ./bitbox-bridge.nix;
bitcoind = runTest ./bitcoind.nix;
nixos/tests/bird.nix
+31 -32
View File
@@ -1,18 +1,9 @@
# This test does a basic functionality check for all bird variants and demonstrates a use
# of the preCheckConfig option.
{
system ? builtins.currentSystem,
pkgs ? import ../.. {
inherit system;
config = { };
},
runTest,
package,
}:
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) optionalString;
makeBirdHost =
hostId:
{ pkgs, ... }:
@@ -33,6 +24,8 @@ let
};
services.bird = {
inherit package;
enable = true;
config = ''
@@ -106,31 +99,37 @@ let
];
};
in
makeTest {
name = "bird";
{
twoNodeOSPF = runTest {
name = "bird-twoNodeOSPF";
nodes.host1 = makeBirdHost "1";
nodes.host2 = makeBirdHost "2";
nodes.host1 = makeBirdHost "1";
nodes.host2 = makeBirdHost "2";
testScript = ''
start_all()
testScript = ''
start_all()
host1.wait_for_unit("bird.service")
host2.wait_for_unit("bird.service")
host1.succeed("systemctl reload bird.service")
host1.wait_for_unit("bird.service")
host2.wait_for_unit("bird.service")
with subtest("Waiting for advertised IPv4 routes"):
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
with subtest("Waiting for advertised IPv6 routes"):
host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
host1.succeed("bird --version")
host2.succeed("bird --version")
with subtest("Check fake routes in preCheckConfig do not exists"):
host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host1.succeed("systemctl reload bird.service")
host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
'';
with subtest("Waiting for advertised IPv4 routes"):
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
with subtest("Waiting for advertised IPv6 routes"):
host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
with subtest("Check fake routes in preCheckConfig do not exists"):
host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")
host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")
'';
};
}
pkgs/applications/misc/yokadi/default.nix
+9 -6
View File
@@ -6,31 +6,34 @@
sqlalchemy,
setproctitle,
icalendar,
colorama,
}:
buildPythonApplication rec {
pname = "yokadi";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz";
sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f";
hash = "sha256-zF2ffHeU+i7wzu1u4DhQ5zJXr8AjXboiyFAisXNX6TM=";
};
propagatedBuildInputs = [
dependencies = [
python-dateutil
sqlalchemy
setproctitle
icalendar
colorama
];
# Yokadi doesn't have any tests
doCheck = false;
meta = with lib; {
meta = {
description = "Command line oriented, sqlite powered, todo-list";
homepage = "https://yokadi.github.io/index.html";
license = licenses.gpl3Plus;
maintainers = [ maintainers.nkpvk ];
mainProgram = "yokadi";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.nkpvk ];
};
}
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+2 -2
View File
@@ -106,8 +106,8 @@ rec {
thunderbird-128 = common {
applicationName = "Thunderbird ESR";
version = "128.11.0esr";
sha512 = "33de73db2d5ab5152ff11c1947317081259f4e7644631b5e6b9c3b192b4473a5ae6fe897b27b3c8e240ff8c606ffaa8cc14e169c34a94b8de6e64b0c5f0f6810";
version = "128.11.1esr";
sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";
pkgs/by-name/an/annotation-mono/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "annotation-mono";
version = "0.2";
src = fetchzip {
url = "https://github.com/qwerasd205/AnnotationMono/releases/download/v${finalAttrs.version}/AnnotationMono_v${finalAttrs.version}.zip";
hash = "sha256-81BcPYE4C9kuetiCzgGPl59WO4QkBML7dwAkD1DCCZo=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/truetype $src/dist/ttf/*.ttf
install -D -m444 -t $out/share/fonts/truetype $src/dist/variable/AnnotationMono-VF.ttf
install -D -m444 -t $out/share/fonts/opentype $src/dist/otf/*.otf
runHook postInstall
'';
meta = {
homepage = "https://github.com/qwerasd205/AnnotationMono";
description = "Lovingly crafted handwriting-style monospace font";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.theonlymrcat ];
};
})
pkgs/by-name/bi/bird2/package.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--runstatedir=/run/bird"
];
passthru.tests = nixosTests.bird;
passthru.tests = nixosTests.bird2;
meta = {
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
pkgs/by-name/bi/bird3/package.nix
+1 -1
View File
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
"--runstatedir=/run/bird"
];
passthru.tests = nixosTests.bird;
passthru.tests = nixosTests.bird3;
meta = {
changelog = "https://gitlab.nic.cz/labs/bird/-/blob/v${version}/NEWS";
pkgs/by-name/ca/casilda/package.nix
+6 -20
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
meson,
ninja,
pkg-config,
@@ -19,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "casilda";
version = "0.2.0";
version = "0.3.0-unstable-2025-06-16";
outputs = [
"out"
@@ -30,22 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
domain = "gitlab.gnome.org";
owner = "jpu";
repo = "casilda";
tag = finalAttrs.version;
hash = "sha256-wTYx4Wj8u52+yNc/A5Lg0zqmhKh8X0q99e+TilpUrC4=";
rev = "5b5933d32f0221341c98a25dea1ce5ef78199a79";
hash = "sha256-LrXoVK7KMjIko6jUkrKY06QdZMQaVrHhG7/C5ickdJA=";
};
patches = [
# Fix missing clock_gettime function
# https://gitlab.gnome.org/jpu/casilda/-/merge_requests/4
(fetchpatch {
url = "https://gitlab.gnome.org/jpu/casilda/-/commit/dcebb8e67d6dc7c47332d1c76a1d5bf60eaee7b1.patch";
hash = "sha256-l3zu29PPRwzDuoeoqUs4Gi3JziyZ9vDdqvRfz7GQ4Sw=";
})
];
depsBuildBuild = [
pkg-config
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
meson
@@ -61,12 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
wayland # for wayland-server
libxkbcommon
wlroots_0_18
];
propagatedBuildInputs = [
gtk4
wlroots_0_18 # todo: move to buildInputs after https://gitlab.gnome.org/jpu/casilda/-/merge_requests/7
];
propagatedBuildInputs = [ gtk4 ];
strictDeps = true;
pkgs/by-name/co/cosmic-session/package.nix
+4 -1
View File
@@ -50,7 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
env = {
XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic;
ORCA = "orca"; # get orca from $PATH
};
passthru = {
providedSessions = [ "cosmic" ];
pkgs/by-name/cr/crc64fast-nvme/Cargo.lock
Generated
+1063
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/cr/crc64fast-nvme/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "crc64fast-nvme";
version = "1.2.0";
src = fetchFromGitHub {
owner = "awesomized";
repo = "crc64fast-nvme";
tag = finalAttrs.version;
hash = "sha256-BEFdVspQU2exj6ndULCs0TfH7aIx/NvfUkTSL32bIPk=";
};
postPatch = ''
cp -L ${./Cargo.lock} Cargo.lock
'';
cargoLock = {
lockFile = ./Cargo.lock;
};
postInstall = ''
mv $out/bin/build_table $out/bin/pclmulqdq_build_table
install -Dm644 crc64fast_nvme.h -t $out/include/
'';
meta = {
description = "SIMD accelerated carryless-multiplication CRC-64/NVME checksum computation (based on Intel's PCLMULQDQ paper)";
homepage = "https://github.com/awesomized/crc64fast-nvme";
mainProgram = "crc_64_nvme_checksum";
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [ powwu ];
};
})
pkgs/by-name/dr/drawterm/package.nix
+5 -5
View File
@@ -13,7 +13,7 @@
wayland,
wayland-protocols,
libxkbcommon,
wlr-protocols,
libdecor,
pulseaudio,
nixosTests,
withWayland ? false,
@@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation {
pname = "drawterm";
version = "0-unstable-2025-05-18";
version = "0-unstable-2025-06-13";
src = fetchFrom9Front {
owner = "plan9front";
repo = "drawterm";
rev = "a6c1ce4e0244ca70403dc4e795a9cee548159560";
hash = "sha256-W9IsFnJE4Bpdc2K9DcRq+zRPMU9Wd4xpM0lHkh5SirQ=";
rev = "4e32a9fa6e58c1474f747a99083303c4a2f14ea7";
hash = "sha256-j0s6xB8c8vQoOzL34Gu84elec0ig4z75NzlUx6PsW4E=";
};
enableParallelBuilding = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
wayland
wayland-protocols
libxkbcommon
wlr-protocols
libdecor
]
++ lib.optionals withXorg [
xorg.libX11
pkgs/by-name/dw/dwarf2json/package.nix
+15 -7
View File
@@ -2,26 +2,34 @@
lib,
fetchFromGitHub,
buildGoModule,
versionCheckHook,
}:
buildGoModule {
buildGoModule (finalAttrs: {
pname = "dwarf2json";
version = "unstable-2021-04-15";
version = "0.9.0";
src = fetchFromGitHub {
owner = "volatilityfoundation";
repo = "dwarf2json";
rev = "e8a1ce85dc33bf2039adc7f8a5f47f3016153720";
sha256 = "sha256-hnS00glAcj78mZp5as63CsEn+dcr+GNEkz8iC3KM0h0=";
rev = "v${finalAttrs.version}";
sha256 = "sha256-M5KKtn5kly23TwbjD5MVLzIum58exXqCFs6jxsg6oGM=";
};
vendorHash = "sha256-tgs0l+sYdAxMHwVTew++keNpDyrHmevpmOBVIiuL+34=";
vendorHash = "sha256-3PnXB8AfZtgmYEPJuh0fwvG38dtngoS/lxyx3H+rvFs=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = with lib; {
homepage = "https://github.com/volatilityfoundation/dwarf2json";
description = "Convert ELF/DWARF symbol and type information into vol3's intermediate JSON";
license = licenses.vol-sl;
maintainers = with maintainers; [ arkivm ];
maintainers = with maintainers; [
arkivm
asauzeau
];
mainProgram = "dwarf2json";
};
}
})
pkgs/by-name/fl/flexget/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.16.3";
version = "3.16.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
tag = "v${version}";
hash = "sha256-07dCSwRLIf/cmNsFuNHs9XXFGuJvwUNWgLuxRsMOXo4=";
hash = "sha256-tmxVk74eqN4qIe7cJF5IIWe7aXIH3Q2vi1galTF+FbI=";
};
pythonRelaxDeps = true;
pkgs/by-name/gk/gk-cli/package.nix
+44 -32
View File
@@ -5,6 +5,7 @@
coreutils,
installShellFiles,
makeWrapper,
gitMinimal,
writeShellScript,
curl,
jq,
@@ -13,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gk-cli";
version = "2.1.2";
version = "3.0.9";
src = (
finalAttrs.passthru.sources.${stdenv.system}
@@ -28,18 +29,34 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -Dm555 gk -t $out/bin/
install -Dm555 gk*/gk -t $out/bin/
installShellCompletion --bash ./**/gk.bash
installShellCompletion --fish ./**/gk.fish
installShellCompletion --zsh ./**/_gk
wrapProgram $out/bin/gk \
--prefix PATH : "${lib.makeBinPath [ gitMinimal ]}"
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/gk \
--prefix PATH : "${lib.makeBinPath [ coreutils ]}"
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# Use timeout because gk hangs instead of closing in the sandbox
installShellCompletion --cmd gk \
--bash <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion bash) \
--fish <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion fish) \
--zsh <(HOME="$(mktemp --directory)" timeout 3 $out/bin/gk completion zsh)
'';
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
installCheckPhase = ''
OUTPUT="$(
HOME="$(mktemp --directory)" \
timeout 3 `# Use timeout because gk hangs instead of closing in the sandbox` \
$out/bin/gk setup \
2>/dev/null \
|| true # Command fails because not logged in
)"
echo "$OUTPUT" | grep --quiet '^Git binary found: ✓$'
echo "$OUTPUT" | grep --quiet '^CLI version: ${finalAttrs.version}$'
'';
passthru = {
@@ -48,49 +65,44 @@ stdenv.mkDerivation (finalAttrs: {
base_url = "https://github.com/gitkraken/gk-cli/releases/download/v${finalAttrs.version}/gk_${finalAttrs.version}_";
in
{
armv6l-linux = fetchzip {
url = "${base_url}Linux_arm6.zip";
hash = "sha256-pnEFTkx1JSmQlniVCXvIB6xGD8XyDh9OLDU0V9AZBTs=";
stripRoot = false;
};
armv7l-linux = fetchzip {
url = "${base_url}Linux_arm7.zip";
hash = "sha256-qj0++i698s4ELKHU9B2sGIqf9hUJip4+2Car+brkRkM=";
stripRoot = false;
};
aarch64-linux = fetchzip {
url = "${base_url}Linux_arm64.zip";
hash = "sha256-vHGhlRHbk2/s3YmBdOPDbalEydpQVFkHiCkBVywa4N0=";
url = "${base_url}linux_arm64.zip";
hash = "sha256-aYgHLpG4nX3Op0+j733jYbK4ZwVKkctMkDPweNTJWso=";
stripRoot = false;
};
x86_32-linux = fetchzip {
url = "${base_url}Linux_i386.zip";
hash = "sha256-t+P9SpS9u/17kga74kbYjD6nkjiFusyIwCRGDnkP3tU=";
url = "${base_url}linux_386.zip";
hash = "sha256-lVu25S7e6a/kHmiD5dxGAlHMQ5yN46+SdFpt8lghejM=";
stripRoot = false;
};
x86_64-linux = fetchzip {
url = "${base_url}Linux_x86_64.zip";
hash = "sha256-O6T27edHi20ZFHiNaZKdk/5dtCn2Tpxm0PR934SRwFk=";
url = "${base_url}linux_amd64.zip";
hash = "sha256-/z2G//Zh8lTHkeJPahyld1EEXXhd/cgIvCojUmzFX8E=";
stripRoot = false;
};
aarch64-darwin = fetchzip {
url = "${base_url}macOS_arm64.zip";
hash = "sha256-LW2K+aveJiyYqfga2jpF3DvvFeHJuozqbc/afgtq2Oc=";
url = "${base_url}darwin_arm64.zip";
hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "${base_url}macOS_x86_64.zip";
hash = "sha256-1w8B4YWouVViTGoUh987pPQIoqdzB0S+M2bBiRI6Kfg=";
url = "${base_url}darwin_amd64.zip";
hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4=";
stripRoot = false;
};
aarch64-windows = fetchzip {
url = "${base_url}windows_arm64.zip";
hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E=";
stripRoot = false;
};
i686-windows = fetchzip {
url = "${base_url}Windows_i386.zip";
hash = "sha256-t81/wK1weZ/uEZ5TzivylARTUqks9rLIG7WzeoWXb1k=";
url = "${base_url}windows_386.zip";
hash = "sha256-u6DyHoYIaExS2CHu20odDVJxzI4k9PpdFQf6UDPAzz0=";
stripRoot = false;
};
x86_64-windows = fetchzip {
url = "${base_url}Windows_x86_64.zip";
hash = "sha256-9yydDMI9Gz/OswRhJHF+2c3Ia0zDmXMbf7byj6PJe24=";
url = "${base_url}windows_amd64.zip";
hash = "sha256-nh+JPR95IWLm7CTrS8qK2dP3c4SH/zm1oIS5GNgxcyo=";
stripRoot = false;
};
};
pkgs/by-name/go/goose-cli/package.nix
+3 -3
View File
@@ -27,17 +27,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "goose-cli";
version = "1.0.27";
version = "1.0.28";
src = fetchFromGitHub {
owner = "block";
repo = "goose";
tag = "v${finalAttrs.version}";
hash = "sha256-+HNAOw/BJVNHiDHeEBKoAAs66IXCdYhm1VzVFIzk4m8=";
hash = "sha256-ExFVgG05jlcz3nP6n94324sgXbIHpj8L30oNuqKyfto=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-v+UQFbFpkwX+7oNFvKf2v2u3OSkPdgOWntXLW6XJibE=";
cargoHash = "sha256-sW4rWLElTPVzD+KCOrikEFcoIRGujMz+wHOWlYBpi0o=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/gt/gtklock-virtkb-module/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
gtk3,
gtklock,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gtklock-virtkb-module";
version = "0-unstable-2025-02-27";
src = fetchFromGitHub {
owner = "progandy";
repo = "gtklock-virtkb-module";
rev = "a11c2d8f14a79f271b02711b38220f927bc7fdf8";
hash = "sha256-+kEv5SlMINCORQQOOZ4Lb1dSJXLCbX2oAsD6NTbuhdE=";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
gtk3
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.tests.testModule = gtklock.passthru.testModule finalAttrs.finalPackage;
meta = {
description = "Gtklock module adding a keyboard to the lockscreen";
homepage = "https://github.com/progandy/gtklock-virtkb-module";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/ha/hatch/package.nix
+4
View File
@@ -129,6 +129,10 @@ python3Packages.buildPythonApplication rec {
# Relies on FHS
# Could not read ELF interpreter from any of the following paths: /bin/sh, /usr/bin/env, /bin/dash, /bin/ls
"test_new_selected_python"
# https://github.com/pypa/hatch/issues/2006
"test_project_location_basic_set_first_project"
"test_project_location_complex_set_first_project"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# This test assumes it is running on macOS with a system shell on the PATH.
pkgs/by-name/hi/high-tide/package.nix
+3 -4
View File
@@ -17,14 +17,14 @@
python313Packages.buildPythonApplication rec {
pname = "high-tide";
version = "0.1.5";
version = "0.1.7";
pyproject = false;
src = fetchFromGitHub {
owner = "Nokse22";
repo = "high-tide";
tag = "v${version}";
hash = "sha256-HoPyqsLPLfqyQbrhoPzr3n81yX1MHZVUVmq5RKDN5pI=";
hash = "sha256-QFa9K/iSPe3cIx90PzPCkJszrygON9ijukv4px3Rob8=";
};
nativeBuildInputs = [
@@ -45,8 +45,6 @@ python313Packages.buildPythonApplication rec {
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
libsecret
]);
@@ -55,6 +53,7 @@ python313Packages.buildPythonApplication rec {
tidalapi
requests
mpd2
pypresence
];
dontWrapGApps = true;
pkgs/by-name/ht/htmx-lsp/package.nix
+8 -5
View File
@@ -2,21 +2,24 @@
lib,
rustPlatform,
fetchFromGitHub,
unstableGitUpdater,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage {
pname = "htmx-lsp";
version = "0.1.0";
version = "0.1.0-unstable-2025-06-14";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "htmx-lsp";
rev = version;
hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo=";
rev = "c45f55b2bf8be2d92489fd6d69a3db07fe5f214b";
hash = "sha256-7CAlYYwsanlOCGeY7gYE5Fzk5IEO4hThgINiJmXql7s=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8=";
cargoHash = "sha256-/ypaTrctJo88DHtF/hv6B0dqB06axd/qKFnuI8zs8KA=";
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
description = "Language server implementation for htmx";
pkgs/by-name/ka/kapitano/package.nix
+75
View File
@@ -0,0 +1,75 @@
{
lib,
fetchFromGitea,
meson,
ninja,
pkg-config,
glib,
gtk4,
libadwaita,
python3Packages,
clamav,
appstream-glib,
desktop-file-utils,
libxml2,
gobject-introspection,
wrapGAppsHook4,
librsvg,
}:
python3Packages.buildPythonApplication rec {
pname = "kapitano";
version = "1.1.2";
pyproject = false;
src = fetchFromGitea {
domain = "codeberg.org";
owner = "zynequ";
repo = "Kapitano";
tag = version;
hash = "sha256-914M0VRyuzDiITUT5sjt9vNaqshn4skz/FWWMxgPTdc=";
fetchLFS = true;
};
nativeBuildInputs = [
meson
ninja
desktop-file-utils
libxml2
pkg-config
appstream-glib
wrapGAppsHook4
gobject-introspection
];
buildInputs = [
glib
gtk4
libadwaita
librsvg
];
dependencies = with python3Packages; [ pygobject3 ];
postPatch = ''
substituteInPlace src/config/paths_config.py \
--replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)'
'';
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
''${gappsWrapperArgs[@]}
--prefix PATH : "${lib.makeBinPath [ clamav ]}"
)
'';
meta = {
description = "Modern ClamAV front-end that uses gtk4/libadwaita";
homepage = "https://codeberg.org/zynequ/Kapitano";
mainProgram = "kapitano";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lonerOrz ];
};
}
pkgs/by-name/lc/lcalc/package.nix
+2 -2
View File
@@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
version = "2.1.0";
version = "2.1.1";
pname = "lcalc";
src = fetchFromGitLab {
owner = "sagemath";
repo = "lcalc";
tag = version;
hash = "sha256-v+7Uh6tPOfb3E9dqxx//RqD22XM4S/8ejS2v+D5G5pE=";
hash = "sha256-0CYrRGn5YQ07BaGu0Q5otnjwyh3sNq21EXp3M/KlRdw=";
};
nativeBuildInputs = [
pkgs/by-name/li/libcollectdclient/package.nix
+11 -9
View File
@@ -1,24 +1,26 @@
{ lib, collectd }:
collectd.overrideAttrs (oldAttrs: {
collectd.overrideAttrs (prevAttrs: {
pname = "libcollectdclient";
buildInputs = [ ];
configureFlags = (oldAttrs.configureFlags or [ ]) ++ [
configureFlags = (prevAttrs.configureFlags or [ ]) ++ [
"--with-perl-bindings=no"
"--disable-daemon"
"--disable-all-plugins"
];
postInstall = "rm -rf $out/{bin,etc,sbin,share}";
meta = with lib; {
meta = {
description = "C Library for collectd, a daemon which collects system performance statistics periodically";
homepage = "http://collectd.org";
license = licenses.gpl2;
platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
maintainers = [
maintainers.sheenobu
maintainers.bjornfor
homepage = "https://collectd.org";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [
sheenobu
bjornfor
];
};
})
pkgs/by-name/li/libnghttp2_asio/package.nix
+3 -3
View File
@@ -5,12 +5,12 @@
cmake,
nghttp2,
openssl,
boost,
boost186,
}:
stdenv.mkDerivation {
pname = "libnghttp2_asio";
version = "unstable-2022-08-11";
version = "0-unstable-2022-08-11";
outputs = [
"out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
];
buildInputs = [
boost
boost186
nghttp2
openssl
];
pkgs/by-name/ma/matrix-continuwuity/package.nix
+3 -3
View File
@@ -31,18 +31,18 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "0.5.0-rc.5";
version = "0.5.0-rc.6";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
tag = "v${finalAttrs.version}";
hash = "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o=";
hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-bjjGR3++CaDEtlsQj9GgdViCEB5l72sI868uTFBtIwg=";
cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/ma/mautrix-discord/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mautrix-discord";
version = "0.7.3";
version = "0.7.4";
src = fetchFromGitHub {
owner = "mautrix";
repo = "discord";
rev = "v${version}";
hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc=";
hash = "sha256-ygnFZ1I8sPgpKwLK+Zr6ZUStGAH2egVDxS/pXmRqXYI=";
};
vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ=";
vendorHash = "sha256-S3MWJi77TXs7gjPt6O2ruSIUHpsrLPIHQz3rQam1Wsg=";
ldflags = [
"-s"
pkgs/by-name/ma/mautrix-gmessages/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mautrix-gmessages";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "mautrix";
repo = "gmessages";
tag = "v${version}";
hash = "sha256-NzLHCVJaYl8q5meKZDy8St8J9c8oyASLLrXhWG7K+yw=";
hash = "sha256-s6d0fUH0md4oHWDGFDRR3SKbJBCH6qJIk4En6J53yIM=";
};
vendorHash = "sha256-+aX0r7IvsjXwmz5d6X0yzhG28mBYKvyDGoCbKMwkvk8=";
vendorHash = "sha256-d6UVKu9Al445JqwhPXSlQDs0hOTom56p+hVZN2C4S0M=";
ldflags = [
"-s"
pkgs/by-name/ma/mautrix-meta/package.nix
+3 -3
View File
@@ -15,7 +15,7 @@
buildGoModule rec {
pname = "mautrix-meta";
version = "0.4.6";
version = "0.5.0";
subPackages = [ "cmd/mautrix-meta" ];
@@ -23,13 +23,13 @@ buildGoModule rec {
owner = "mautrix";
repo = "meta";
rev = "v${version}";
hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8=";
hash = "sha256-SM57PLfRVEKspqnAZz1XES6ba9Puuzvx8XZwAWKVRmw=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs=";
vendorHash = "sha256-+gQPlI9DHuY01JlUnEaYctOs+2XFAkw+X9SkvH0xlbc=";
passthru = {
tests = {
pkgs/by-name/me/meowlnir/package.nix
+3 -3
View File
@@ -9,18 +9,18 @@
buildGoModule rec {
pname = "meowlnir";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "maunium";
repo = "meowlnir";
tag = "v${version}";
hash = "sha256-1YuSXKRiMUCRbxGIDOQKGKK7CxM3VD0LLEeULQJ/zRo=";
hash = "sha256-TKt6uwj3RdhSEjGnWmYybJFaQ82qf3tXY4PPUAm6juQ=";
};
buildInputs = [ olm ];
vendorHash = "sha256-g0be4ftBRV6Ver1kULfhnVBAF+iL3+/4e25sozpJ7+s=";
vendorHash = "sha256-rFk4QUAI/Brclt/X/T7O0T6v2dTxpqbNLtoi0twYliw=";
doCheck = true;
doInstallCheck = true;
pkgs/by-name/mi/mihomo-party/package.nix
+3 -3
View File
@@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mihomo-party";
version = "1.7.5";
version = "1.7.6";
src =
let
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
fetchurl {
url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${finalAttrs.version}/mihomo-party-linux-${finalAttrs.version}-${arch}.deb";
hash = selectSystem {
x86_64-linux = "sha256-Kw7VDyJ07DeinAzsilJU0vBhDLViB8zlpIA+mAPpp2M=";
aarch64-linux = "sha256-OljIM8BI8umkRB1wUqcwQ/H1i1FhYtQ4d5cXMi/Lt9E=";
x86_64-linux = "sha256-83RajPreGieOYBAkoR6FsFREnOGDDuMK6+Qg+R/koac=";
aarch64-linux = "sha256-oWOXLUYWRKRgPtNv9ZvM1ODd44dhymVTKHJBK/xxOOs=";
};
};
pkgs/by-name/mp/mpris-discord-rpc/package.nix
+47
View File
@@ -0,0 +1,47 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
dbus,
openssl,
stdenv,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mpris-discord-rpc";
version = "0.4.0";
src = fetchFromGitHub {
owner = "patryk-ku";
repo = "mpris-discord-rpc";
tag = "v${finalAttrs.version}";
hash = "sha256-szftij29YTLzqBNirvoTgZfPIRznM1Ax5MPTKqB1nYI=";
};
cargoHash = "sha256-/QYeNcmkW6cm1VJkzJfVGvZU79wGswhKUFYc54oQbGw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
dbus
openssl
];
postInstall = ''
mkdir --parents $out/etc/systemd/user
substitute $src/mpris-discord-rpc.service $out/etc/systemd/user/mpris-discord-rpc.service \
--replace-fail /usr/bin/mpris-discord-rpc $out/bin/mpris-discord-rpc
'';
meta = {
description = "Linux Discord rich presence for music, using MPRIS with album cover and progress bar support";
homepage = "https://github.com/patryk-ku/mpris-discord-rpc";
changelog = "https://github.com/patryk-ku/mpris-discord-rpc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.lukaswrz ];
mainProgram = "mpris-discord-rpc";
};
})
pkgs/by-name/mu/museeks/package.nix
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "museeks";
version = "0.20.9";
version = "0.21.1";
src = fetchurl {
url = "https://github.com/martpie/museeks/releases/download/${finalAttrs.version}/Museeks_${finalAttrs.version}_amd64.deb";
hash = "sha256-7jRgMpfQTJr3yW3YAPTnPSvtrqumScN3Tr7YXQX3Fi8=";
hash = "sha256-4UHMh8rZUDGNlz59EMGTgV/jfd6K9RyXVpMr2sinPUQ=";
};
nativeBuildInputs = [
pkgs/by-name/oa/oama/package.nix
+19
View File
@@ -2,6 +2,12 @@
haskell,
lib,
stdenv,
coreutils,
libsecret,
gnupg,
makeBinaryWrapper,
withLibsecret ? true, # default oama config uses libsecret
withGpg ? false,
}:
let
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
@@ -12,6 +18,19 @@ let
maintainers = with lib.maintainers; [ aidalgol ];
passthru.updateScript = ./update.sh;
buildDepends = [
makeBinaryWrapper
];
postInstall = ''
wrapProgram $out/bin/oama \
--prefix PATH : ${
lib.makeBinPath (
[ coreutils ] ++ lib.optional withLibsecret libsecret ++ lib.optional withGpg gnupg
)
}
'';
};
raw-pkg = haskell.packages.ghc912.callPackage ./generated-package.nix { };
pkgs/by-name/re/readest/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "readest";
version = "0.9.57";
version = "0.9.58";
src = fetchFromGitHub {
owner = "readest";
repo = "readest";
tag = "v${finalAttrs.version}";
hash = "sha256-w4DhxjhejJ2Nh/3+/bEBJx3nRyAhr5lyzoPb/AFbVPc=";
hash = "sha256-OXKYPcAugMW55TTID2iHeBPIdRiRzLJQ5pG4/kTIn/4=";
fetchSubmodules = true;
};
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-ejA0bUAB1CuPZMPA1a4XlbHR6CTrvKf/rPHolYjpcW8=";
hash = "sha256-Tt1Gm/tlxceQnTd6eStgwboHCDetXdUNtdDShHmB5+M=";
};
pnpmRoot = "../..";
pkgs/by-name/s3/s3ql/0001-setup.py-remove-self-reference.patch
+68
View File
@@ -0,0 +1,68 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 11 Jun 2025 10:41:42 -0700
Subject: [PATCH] setup.py: remove self-reference and DEVELOPER_MODE
Signed-off-by: Philip Taron <philip.taron@gmail.com>
---
setup.py | 33 ++-------------------------------
1 file changed, 2 insertions(+), 31 deletions(-)
diff --git a/setup.py b/setup.py
index 00f6e9b120525d63fbc17949b2804785f1286118..b5582bcc366148d9c0a442abade65a6127ef2d3c 100755
--- a/setup.py
+++ b/setup.py
@@ -26,15 +26,7 @@ from setuptools.command.test import test as TestCommand
faulthandler.enable()
-basedir = os.path.abspath(os.path.dirname(sys.argv[0]))
-DEVELOPER_MODE = os.path.exists(os.path.join(basedir, 'MANIFEST.in'))
-if DEVELOPER_MODE:
- print('MANIFEST.in exists, running in developer mode')
-
-# Add S3QL sources
-sys.path.insert(0, os.path.join(basedir, 'src'))
-sys.path.insert(0, os.path.join(basedir, 'util'))
-import s3ql
+basedir = "/build/source"
class pytest(TestCommand):
@@ -52,27 +44,6 @@ def main():
compile_args = ['-Wall', '-Wextra', '-Wconversion', '-Wsign-compare']
- # Enable all fatal warnings only when compiling from Mercurial tip.
- # (otherwise we break forward compatibility because compilation with newer
- # compiler may fail if additional warnings are added)
- if DEVELOPER_MODE:
- if os.environ.get('CI') != 'true':
- compile_args.append('-Werror')
-
- # Value-changing conversions should always be explicit.
- compile_args.append('-Werror=conversion')
-
- # Note that (i > -1) is false if i is unsigned (-1 will be converted to
- # a large positive value). We certainly don't want to do this by
- # accident.
- compile_args.append('-Werror=sign-compare')
-
- # These warnings have always been harmless, and have always been due to
- # issues in Cython code rather than S3QL. Cython itself warns if there
- # are unused variables in .pyx code.
- compile_args.append('-Wno-unused-parameter')
- compile_args.append('-Wno-unused-function')
-
required_pkgs = [
'apsw >= 3.42.0', # https://github.com/rogerbinns/apsw/issues/459
'cryptography',
@@ -88,7 +59,7 @@ def main():
setuptools.setup(
name='s3ql',
zip_safe=False,
- version=s3ql.VERSION,
+ version="@version@",
description='a full-featured file system for online data storage',
long_description=long_desc,
author='Nikolaus Rath',
pkgs/by-name/s3/s3ql/package.nix
+40 -12
View File
@@ -2,28 +2,56 @@
lib,
fetchFromGitHub,
python3,
replaceVars,
sqlite,
which,
nix-update-script,
writableTmpDirAsHomeHook,
}:
python3.pkgs.buildPythonApplication rec {
let
inherit (python3.pkgs)
buildPythonApplication
setuptools
cython
apsw
cryptography
defusedxml
google-auth
google-auth-oauthlib
pyfuse3
requests
trio
pytest-trio
pytestCheckHook
python
;
in
buildPythonApplication rec {
pname = "s3ql";
version = "5.2.3";
version = "5.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "s3ql";
repo = "s3ql";
tag = "s3ql-${version}";
hash = "sha256-hNqKLpJd0vj96Jx4YnqYsPLq/iTbvmtvjyLrYozaxpk=";
hash = "sha256-SVB+VB508hGXvdHZo5lt09yssjjwHS1tsDU8M4j+swc=";
};
build-system = with python3.pkgs; [ setuptools ];
patches = [
(replaceVars ./0001-setup.py-remove-self-reference.patch { inherit version; })
];
nativeBuildInputs = [ which ] ++ (with python3.pkgs; [ cython ]);
build-system = [ setuptools ];
propagatedBuildInputs = with python3.pkgs; [
nativeBuildInputs = [
which
cython
];
dependencies = [
apsw
cryptography
defusedxml
@@ -35,23 +63,23 @@ python3.pkgs.buildPythonApplication rec {
trio
];
nativeCheckInputs = with python3.pkgs; [
nativeCheckInputs = [
pytest-trio
pytestCheckHook
writableTmpDirAsHomeHook
];
preBuild = ''
${python3.pkgs.python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace
'';
preCheck = ''
export HOME=$(mktemp -d)
${python.pythonOnBuildForHost.interpreter} ./setup.py build_cython build_ext --inplace
'';
pythonImportsCheck = [ "s3ql" ];
pytestFlagsArray = [ "tests/" ];
# SSL EOF error doesn't match connection reset error. Seems fine.
disabledTests = [ "test_aborted_write2" ];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
pkgs/by-name/sc/scala-next/package.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ scala, fetchurl }:
scala.bare.overrideAttrs (oldAttrs: {
version = "3.7.0";
version = "3.7.1";
pname = "scala-next";
src = fetchurl {
inherit (oldAttrs.src) url;
hash = "sha256-T2zGqv2XSjdA3t0FaJvldcthgpgRrMTyiRznlgQOmBE=";
hash = "sha256-XIeG4T7TXPVAEMteD0BSWrAv7V1f7xrkLpbdpHFuWAw=";
};
})
pkgs/by-name/si/singular/package.nix
+13
View File
@@ -1,6 +1,7 @@
{
stdenv,
fetchFromGitHub,
fetchpatch,
gmp,
bison,
perl,
@@ -70,6 +71,18 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
# Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0)
patches = [
(fetchpatch {
url = "https://github.com/Singular/Singular/commit/05f5116e13c8a4f5f820c78c35944dd6d197d442.patch";
hash = "sha256-4l7JaCCFzE+xINU+E92eBN5CJKIdtQHly4Ed3ZwbKTA=";
})
(fetchpatch {
url = "https://github.com/Singular/Singular/commit/595d7167e6e019d45d9a4f1e18ae741df1f3c41d.patch";
hash = "sha256-hpTZy/eAiHAaleasWPAenxM35aqeNAZ//o6OqqdGOJ4=";
})
];
# For reference (last checked on commit 75f460d):
# https://github.com/Singular/Singular/blob/spielwiese/doc/Building-Singular-from-source.md
# https://github.com/Singular/Singular/blob/spielwiese/doc/external-packages-dynamic-modules.md
pkgs/by-name/ta/tauno-monitor/package.nix
+2 -2
View File
@@ -13,14 +13,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "tauno-monitor";
version = "0.1.28";
version = "0.1.29";
pyproject = false;
src = fetchFromGitHub {
owner = "taunoe";
repo = "tauno-monitor";
tag = "v${version}";
hash = "sha256-DxWB69bkDAe35ci/e18Dji0EpZvbz7Y5y+32ZchV/m8=";
hash = "sha256-U7vp0cPIRQeeuLGazoCQAnVQaKxDznC65bE31SwYU3A=";
};
nativeBuildInputs = [
pkgs/by-name/up/upbound/sources-main.json
+17 -17
View File
@@ -8,38 +8,38 @@
"fetchurlAttrSet": {
"docker-credential-up": {
"aarch64-darwin": {
"hash": "sha256-8VKSDsmuYu/GaKo4JybWEnd+gbW9ZSjEoNlZ7SEans0=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_arm64.tar.gz"
"hash": "sha256-EPJXlxa4Vx7jzdX5/ekIer/EKTAFuqWBcAp4mYyS+JA=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/darwin_arm64.tar.gz"
},
"aarch64-linux": {
"hash": "sha256-WPllvTQJr5S6g2h9fe3qXKL/CH7XzADbNRoy+6rex6A=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_arm64.tar.gz"
"hash": "sha256-cM8F+Qyg34ypdIusI2jFOzoxM3B+tLRyvmqdeUSpz0c=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/linux_arm64.tar.gz"
},
"x86_64-darwin": {
"hash": "sha256-bdKjFgJuKbFQDX1dgz6y2Ue6cFnu4Dec+I7FX+fo/pA=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/darwin_amd64.tar.gz"
"hash": "sha256-jvBe0GEDNMj3HlbMBFcwS1CA2y3QnDkYgv943GW0tLs=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/darwin_amd64.tar.gz"
},
"x86_64-linux": {
"hash": "sha256-ieP9uiRcgcYqYClB7vGdHF1IpjH61dXD8bqpPPy2Uik=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/docker-credential-up/linux_amd64.tar.gz"
"hash": "sha256-c/tjuO3j+pYFlyGRAeA3jJLit4sZqreEzMa0LRxnTv0=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/docker-credential-up/linux_amd64.tar.gz"
}
},
"up": {
"aarch64-darwin": {
"hash": "sha256-YYsgNpNVnTp2bPIp9DD1l0YwHcEpMknu7RrIUQ5scCo=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_arm64.tar.gz"
"hash": "sha256-ecNGveGSxYsKFGkAqWNkpr8RKquL1k+/8LsZBNEgWq8=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/darwin_arm64.tar.gz"
},
"aarch64-linux": {
"hash": "sha256-wone2UA+Z0wCISQ/PsfYdQqNkX5txVVEyx4a8JnLHXo=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_arm64.tar.gz"
"hash": "sha256-70c9eE+SewPICRPzIdOmAj503xB/cL5ud2sQc4uJkJQ=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/linux_arm64.tar.gz"
},
"x86_64-darwin": {
"hash": "sha256-hxLZGWq94eHro4G9VJY+FLoz6AHuhm1quP/bhTzBXhE=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/darwin_amd64.tar.gz"
"hash": "sha256-DQZNsUYLM97zo7ua5xmxSqkxbC91qqLe49yI6X9ELbM=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/darwin_amd64.tar.gz"
},
"x86_64-linux": {
"hash": "sha256-GwAu6z6A4HUhc6vO6xiKZlITm5xiLas8zffuWnesji8=",
"url": "https://cli.upbound.io/main/v0.39.0-8.gfb176095/bundle/up/linux_amd64.tar.gz"
"hash": "sha256-WmsFhA5fteS3+12wPAGym0TZHax+v3zicbh+48aaW0Q=",
"url": "https://cli.upbound.io/main/v0.39.0-43.g3cca6045/bundle/up/linux_amd64.tar.gz"
}
}
},
@@ -49,5 +49,5 @@
"x86_64-darwin",
"x86_64-linux"
],
"version": "0.39.0-8.gfb176095"
"version": "0.39.0-43.g3cca6045"
}
pkgs/by-name/va/vassal/package.nix
+26 -1
View File
@@ -6,6 +6,9 @@
jre,
makeWrapper,
wrapGAppsHook3,
makeDesktopItem,
copyDesktopItems,
versionCheckHook,
}:
stdenv.mkDerivation rec {
@@ -24,6 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
makeWrapper
wrapGAppsHook3
copyDesktopItems
];
installPhase = ''
@@ -39,22 +43,43 @@ stdenv.mkDerivation rec {
--add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
VASSAL.launch.ModuleManager"
install -Dm444 -t "$out/share/icons/hicolor/scalable/apps/" VASSAL.svg
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "VASSAL";
exec = "vassal";
icon = "VASSAL";
desktopName = "VASSAL";
comment = "The open-source boardgame engine";
categories = [ "Game" ];
startupWMClass = "VASSAL-launch-ModuleManager";
})
];
# Don't move doc to share/, VASSAL expects it to be in the root
forceShare = [
"man"
"info"
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/vassal";
versionCheckProgramArg = "--version";
meta = with lib; {
description = "Free, open-source boardgame engine";
homepage = "https://vassalengine.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.lgpl21Only;
maintainers = with maintainers; [ tvestelind ];
platforms = platforms.unix;
platforms = with lib.platforms; unix ++ windows;
mainProgram = "vassal";
};
}
pkgs/by-name/we/wealthfolio/package.nix
+4 -4
View File
@@ -18,18 +18,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wealthfolio";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "afadil";
repo = "wealthfolio";
rev = "v${finalAttrs.version}";
hash = "sha256-HxzLGo+Tu8r58q7agagapfb69yxmFOLJFqDTQVYhpUE=";
hash = "sha256-NO+cqpEUc1A7Gk0jW5ycHgggYq3hlzf5jJIUTNQD5vA=";
};
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) src pname version;
hash = "sha256-wKj1jy/TDi8Cckx9et2XzX3yPnmfXMDrqv9c4+Yyhu4=";
hash = "sha256-KupqObdNrnWbbt9C4NNmgmQCfJ2O4FjJBwGy6XQhhHg=";
};
cargoRoot = "src-tauri";
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
src
cargoRoot
;
hash = "sha256-9qxbgVEOmSaOBL6Vo3ZufNyn9wfs/FI+Pz38BiS91S8=";
hash = "sha256-3f3b4aWUewolUI3kWpKSywvlf5WBBiewHbGK0uzdyXY=";
};
nativeBuildInputs = [
pkgs/development/libraries/flint/3.nix
+2 -2
View File
@@ -22,11 +22,11 @@ assert
stdenv.mkDerivation rec {
pname = "flint3";
version = "3.2.1";
version = "3.3.1";
src = fetchurl {
url = "https://flintlib.org/download/flint-${version}.tar.gz";
hash = "sha256-ynvkbXeXInfrb+DE92dUhDL1a7U0qhfW26LXzOFc0j8=";
hash = "sha256-ZNcOUTB2z6lx4EELWMHaXTURKRPppWtE4saBtFnT6vs=";
};
nativeBuildInputs = [
pkgs/development/ocaml-modules/directories/default.nix
+12 -7
View File
@@ -2,24 +2,28 @@
lib,
fetchFromGitHub,
buildDunePackage,
fpath,
}:
buildDunePackage rec {
pname = "directories";
version = "0.5";
useDune2 = true;
version = "0.6";
minimalOCamlVersion = "4.07";
minimalOCamlVersion = "4.14";
src = fetchFromGitHub {
owner = "ocamlpro";
owner = "OCamlPro";
repo = pname;
rev = version;
sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc=";
tag = version;
hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c=";
};
propagatedBuildInputs = [
fpath
];
meta = {
homepage = "https://github.com/ocamlpro/directories";
homepage = "https://github.com/OCamlPro/directories";
description = "OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows";
longDescription = ''
directories is an OCaml library that provides configuration, cache and
@@ -31,6 +35,7 @@ buildDunePackage rec {
xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
macOS.
'';
changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ bcc32 ];
};
pkgs/development/ocaml-modules/eigen/default.nix
+10 -9
View File
@@ -4,19 +4,18 @@
buildDunePackage,
fetchFromGitHub,
ctypes,
dune-configurator,
}:
buildDunePackage rec {
pname = "eigen";
version = "0.2.0";
useDune2 = true;
version = "0.3.3";
src = fetchFromGitHub {
owner = "owlbarn";
repo = pname;
rev = version;
sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f";
tag = version;
hash = "sha256-8V4DQ+b2rzy58NTenK1BsJEJiJKYV6hIp2fJWqczHRY=";
};
minimalOCamlVersion = "4.02";
@@ -25,11 +24,13 @@ buildDunePackage rec {
propagatedBuildInputs = [ ctypes ];
meta = with lib; {
buildInputs = [ dune-configurator ];
meta = {
inherit (src.meta) homepage;
description = "Minimal/incomplete Ocaml interface to Eigen3, mostly for Owl";
platforms = platforms.x86_64;
maintainers = [ maintainers.bcdarwin ];
license = licenses.mit;
platforms = lib.platforms.x86_64;
maintainers = with lib.maintainers; [ bcdarwin ];
license = lib.licenses.mit;
};
}
pkgs/development/php-packages/relay/default.nix
+16 -16
View File
@@ -15,36 +15,36 @@
}:
let
version = "0.10.1";
version = "0.11.0";
hashes = {
"aarch64-darwin" = {
platform = "darwin-arm64";
hash = {
"8.1" = "sha256-0p24kOzj4l0wBPzmjAzTv1a0EUa4In1pjWHhNhrmsyM=";
"8.2" = "sha256-mgRjWEmtCFg7711RgC2lpSDs5cCcs+ZPqks/uj1mAJo=";
"8.3" = "16nESEzMRDIiVfwjXsGhJsK9UG5UKgfSunHPeyNnyz0=";
"8.4" = "sha256-g8H4vRb1XTnFQo2Db1qvzsENqPYg89/0HSxsW2tDLQQ=";
"8.5" = "6NAzMBqBV0BUI4/KlIbnyz0kcD/hucO4tzbuwPSptig=";
"8.1" = "sha256-/yaUulwiT+y7WZHPTdOWUgMsOnSwGrzMeVuT5W0XFsY=";
"8.2" = "sha256-AFisp5/LsCoVjHQ8VA9d4vUDPutYi26PzsPVton0Gjw=";
"8.3" = "dAJKUU5NED6QHFNrgRTLshkdT6ZtlRlcZh10rGQTON0=";
"8.4" = "sha256-cx2IcRRfD6PyQzZJaWgS4d5Mf70w0uJAwl9hTkr6cDo=";
"8.5" = "8ZfP++7jKcHdm89P+LOQj+ZsXbp2E3b3yuTQx6bOkmE=";
};
};
"aarch64-linux" = {
platform = "debian-aarch64+libssl3";
hash = {
"8.1" = "sha256-E6GDFgRgm5I1acqLYFs9kw3TAuHq5aq7TatLnPHJseA=";
"8.2" = "sha256-59Un0hAidN/Diu9utUnOgMIdt5ZtOcBFtWrLdHkdME4=";
"8.3" = "sha256-ssqZ85KrQG69fZ39RKceEJPXyGfxxLPI21tnPXtPZDE=";
"8.4" = "JhFUplu9zMgXX2k2RArWWf0pFweAV+1+/T3yUwblJ2A=";
"8.5" = "Ii2bsG4AMMwAKopyOz/qX1RxMaGcstO8kYgup8Vb50w=";
"8.1" = "sha256-VYIWr0PyEzP3HHpnLI1X8NC48Oz9VWi1D70y7xT0WMw=";
"8.2" = "sha256-wF4BiiSRro0R6OUpintAas6WSFuyWiUSVc4yHjBkFRo=";
"8.3" = "sha256-LvIaYShHy4S7McpRX4EoWXpfNSkg2TV587IGbLaeMfg=";
"8.4" = "56Yzuu4JWwnKPabxU0stuLjz3N4AHeRuHeLc8OsdfxU=";
"8.5" = "lcSpj+VgT0soIzN0NX3S9JDO/gHSugKfRL5C3oLvg2w=";
};
};
"x86_64-linux" = {
platform = "debian-x86-64+libssl3";
hash = {
"8.1" = "sha256-MmRAfRDcG1qV8FrZmhME3UtmXe7Mapk2vSrtE/fQRcE=";
"8.2" = "sha256-2ZRxJJhQaIkWQJX7bdti6+UFk7zY9yCJ9KWTtE3uGAE=";
"8.3" = "sha256-QlUk6q5LQuhWbuqWgb8/JdRfO8V+M6GcTu7rjRqJeiI=";
"8.4" = "V+tl7jTrq8PWEAXXu9IsqIlFiQcZBtMBDTlltWSO9CI=";
"8.5" = "w4Ba1Oh4JDsuZc5nrYH8lITP6Gk4/0i1wwOHmr4BO44=";
"8.1" = "sha256-0gdkrhG/YSl6tjhrQnpIxC6YQj+NJqte6UNDdPv5YvE=";
"8.2" = "sha256-8vQ3Le3ssgb0jTxY2vUmriAHSFJXFlZxcYHcTHFkXDc=";
"8.3" = "sha256-VqtIugl5LZgc/VB7lmXewV3SxagD9l2C966W24sz3Qo=";
"8.4" = "3LjLX+zSjsCmnSWq2xD6wfnHf1dCY/Dl5CXJ3A8DY6Y=";
"8.5" = "TaJQcmxs7baH1pMnSvAoZqPaTiSujFQu1VBTB6h3fA0=";
};
};
};
pkgs/development/python-modules/falconpy/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "falconpy";
version = "1.5.2";
version = "1.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "CrowdStrike";
repo = "falconpy";
tag = "v${version}";
hash = "sha256-neZ0V0OpX1GTchkLdE+hKMRl9jKnJ/OCtXY0q1eAxzA=";
hash = "sha256-yK6delBTDnK5cP8mWIQZRfZClRsM2IeqjqrqOjbrlnc=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/fastembed/default.nix
+2 -2
View File
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "fastembed";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
src = fetchFromGitHub {
owner = "qdrant";
repo = "fastembed";
tag = "v${version}";
hash = "sha256-CnUg6ZJ3VmKXbeWWsD0j4KTdUhqrgOP5PBnHtghugHQ=";
hash = "sha256-zftNBATvb9iCjEOWIg0Q8/1+VwQ1km/iob3TgOAfJbg=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-network-connectivity";
version = "2.8.0";
version = "2.8.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "google_cloud_network_connectivity";
hash = "sha256-NHZII5BYlysvlPBxXSu9nN7uqh/Ly3dLtgEuTS9eQOw=";
hash = "sha256-U8czLn5ttFuJ2VynJ0R/fJlK9r0zC43qpP1aU8coorA=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/openai/default.nix
+4 -4
View File
@@ -37,6 +37,7 @@
nest-asyncio,
pytest-asyncio,
pytest-mock,
pytest-xdist,
respx,
# optional-dependencies toggle
@@ -46,7 +47,7 @@
buildPythonPackage rec {
pname = "openai";
version = "1.86.0";
version = "1.87.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -55,7 +56,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
tag = "v${version}";
hash = "sha256-PDYyuvCkDfQrbkSz0CPfJr++WUu5mODY2nVzTanwqjo=";
hash = "sha256-KXvtAxkALZd/T5mVLkDemO7qQ7E2CLVmRpAg1+cRcdU=";
};
postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
@@ -103,14 +104,13 @@ buildPythonPackage rec {
nest-asyncio
pytest-asyncio
pytest-mock
pytest-xdist
respx
];
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"
# snapshot mismatches
"--inline-snapshot=update"
];
disabledTests =
pkgs/development/python-modules/paddleocr/default.nix
+2 -2
View File
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "paddleocr";
version = "3.0.1";
version = "3.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "PaddlePaddle";
repo = "PaddleOCR";
tag = "v${version}";
hash = "sha256-B8zIiRpvT0oa/Gg2dLXTqBZmM+XDH3sOzODvleN638E=";
hash = "sha256-PatqxQQR0uwZwNFYBAeAF5JfsRNhA6fzcy7lufWZARg=";
};
patches = [
pkgs/development/python-modules/pygame-ce/default.nix
+5 -2
View File
@@ -12,6 +12,7 @@
ninja,
meson-python,
pyproject-metadata,
nix-update-script,
fontconfig,
freetype,
@@ -30,7 +31,7 @@
buildPythonPackage rec {
pname = "pygame-ce";
version = "2.5.4";
version = "2.5.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -39,7 +40,7 @@ buildPythonPackage rec {
owner = "pygame-community";
repo = "pygame-ce";
tag = version;
hash = "sha256-joMc3QaQNbZ65pBJ7r5D6lWAGW9eM+e0k/ozOHfQL4U=";
hash = "sha256-OWC063N7G8t2ai/Qyz8DwP76BrFve5ZCbLD/mQwVbi4=";
# Unicode files cause different checksums on HFS+ vs. other filesystems
postFetch = "rm -rf $out/docs/reST";
};
@@ -158,6 +159,8 @@ buildPythonPackage rec {
"pygame.version"
];
passthru.updateScript = nix-update-script { };
passthru.tests = {
inherit pygame-gui;
};
pkgs/development/python-modules/reflex-hosting-cli/default.nix
+2 -2
View File
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "reflex-hosting-cli";
version = "0.1.49";
version = "0.1.50";
pyproject = true;
# source is not published https://github.com/reflex-dev/reflex/issues/3762
src = fetchPypi {
pname = "reflex_hosting_cli";
inherit version;
hash = "sha256-cIU2/hTxXtAsxn5twV8xGwAOcRfqBjeqL4dklXt5fkQ=";
hash = "sha256-1ZTTc09P/0rTNhiqsNDB2RMLcUjKt1rIWtufakkFWkg=";
};
pythonRelaxDeps = [
pkgs/os-specific/linux/zfs/2_3.nix
+3 -3
View File
@@ -11,10 +11,10 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package.
kernelModuleAttribute = "zfs_2_3";
# check the release notes for compatible kernels
kernelCompatible = kernel: kernel.kernelOlder "6.15";
kernelCompatible = kernel: kernel.kernelOlder "6.16";
# this package should point to the latest release.
version = "2.3.2";
version = "2.3.3";
tests =
{
@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
amarshall
];
hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
}
pkgs/os-specific/linux/zfs/unstable.nix
+3 -3
View File
@@ -9,20 +9,20 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package.
kernelModuleAttribute = "zfs_unstable";
# check the release notes for compatible kernels
kernelCompatible = kernel: kernel.kernelOlder "6.15";
kernelCompatible = kernel: kernel.kernelOlder "6.16";
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.3.2";
version = "2.3.3";
# rev = "";
tests = {
inherit (nixosTests.zfs) unstable;
};
hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8=";
hash = "sha256-NXAbyGBfpzWfm4NaP1/otTx8fOnoRV17343qUMdQp5U=";
extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
pkgs/servers/monitoring/zabbix/versions.nix
+2 -2
View File
@@ -4,8 +4,8 @@ generic: {
hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54=";
};
v70 = generic {
version = "7.0.13";
hash = "sha256-2e9/HPsL3lZY2rsigIIPnOHPMyV/rHn0DwM3Org60Xw=";
version = "7.0.14";
hash = "sha256-/otU7tnjoF3UXPSxoqpjv9wRR+h0DeioeMyu+tHttv8=";
};
v60 = generic {
version = "6.0.36";
pkgs/tools/misc/anystyle-cli/Gemfile
+2 -29
View File
@@ -1,37 +1,10 @@
source 'https://rubygems.org'
gemspec
group :development, :test do
#gem 'anystyle-data', github: 'inukshuk/anystyle-data'
#gem 'wapiti', github: 'inukshuk/wapiti-ruby'
gem 'bibtex-ruby'
gem 'rake'
gem 'rspec', '~>3.0'
gem 'language_detector', github: 'feedbackmine/language_detector'
gem 'unicode-scripts'
gem 'edtf'
gem 'citeproc'
gem 'unicode_utils' if RUBY_VERSION < '2.4'
end
group :coverage do
gem 'simplecov', require: false
gem 'coveralls', require: false if ENV['CI']
gem 'anystyle', github: 'inukshuk/anystyle'
end
group :debug do
gem 'byebug', require: false
end
group :profile do
gem 'ruby-prof', require: false
gem 'gnuplot', require: false
end
group :extra do
gem 'lmdb'
gem 'redis'
gem 'redis-namespace'
gem 'yard'
gem 'debug', require: false
end
pkgs/tools/misc/anystyle-cli/Gemfile.lock
+49 -78
View File
@@ -1,99 +1,70 @@
GIT
remote: https://github.com/feedbackmine/language_detector.git
revision: 89102790194150b3a8110ce691f9989b8ce70f8d
remote: https://github.com/inukshuk/anystyle.git
revision: c6f5fb2fa6e8ce9456ad1e1e88d6bba5f3d7731d
specs:
language_detector (0.1.2)
anystyle (1.6.0)
anystyle-data (~> 1.3)
bibtex-ruby (~> 6.0)
namae (~> 1.0)
wapiti (~> 2.1)
PATH
remote: .
specs:
anystyle (1.3.10)
anystyle-data (~> 1.2)
bibtex-ruby (~> 5.0)
anystyle-cli (1.5.0)
anystyle (~> 1.6)
gli (~> 2.17)
namae (~> 1.0)
wapiti (~> 1.0, >= 1.0.2)
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
anystyle-data (1.2.0)
bibtex-ruby (5.1.4)
anystyle-data (1.3.0)
bibtex-ruby (6.1.0)
latex-decode (~> 0.0)
builder (3.2.4)
byebug (11.1.3)
citeproc (1.0.10)
namae (~> 1.0)
concurrent-ruby (1.1.7)
diff-lcs (1.4.4)
docile (1.3.2)
edtf (3.0.5)
activesupport (>= 3.0, < 7.0)
gli (2.19.2)
gnuplot (2.6.2)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
latex-decode (0.3.1)
lmdb (0.5.3)
minitest (5.14.1)
namae (1.0.1)
rake (13.0.1)
redis (4.2.1)
redis-namespace (1.8.0)
redis (>= 3.0.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
ruby-prof (1.4.1)
simplecov (0.19.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
thread_safe (0.3.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-scripts (1.6.0)
wapiti (1.0.7)
racc (~> 1.7)
builder (3.3.0)
date (3.4.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
erb (5.0.1)
gli (2.22.2)
ostruct
io-console (0.8.0)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
latex-decode (0.4.0)
namae (1.2.0)
racc (~> 1.7)
ostruct (0.6.1)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
psych (5.2.6)
date
stringio
racc (1.8.1)
rdoc (6.14.0)
erb
psych (>= 4.0.0)
reline (0.6.1)
io-console (~> 0.5)
rexml (3.4.1)
stringio (3.1.7)
wapiti (2.1.0)
builder (~> 3.2)
yard (0.9.25)
zeitwerk (2.4.0)
rexml (~> 3.0)
PLATFORMS
arm64-darwin-24
ruby
DEPENDENCIES
anystyle!
bibtex-ruby
byebug
citeproc
edtf
gnuplot
language_detector!
lmdb
rake
redis
redis-namespace
rspec (~> 3.0)
ruby-prof
simplecov
unicode-scripts
yard
anystyle-cli!
debug
BUNDLED WITH
2.1.4
2.5.22
pkgs/tools/misc/anystyle-cli/anystyle-cli.gemspec
+32
View File
@@ -0,0 +1,32 @@
# -*- encoding: utf-8 -*-
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
require 'anystyle/cli/version'
Gem::Specification.new do |s|
s.name = 'anystyle-cli'
s.version = AnyStyle::CLI::VERSION.dup
s.platform = Gem::Platform::RUBY
s.authors = ['Sylvester Keil']
s.email = ['http://sylvester.keil.or.at']
s.homepage = 'http://anystyle.io'
s.summary = 'AnyStyle CLI'
s.description = 'A command line interface to the AnyStyle Parser and Finder.'
s.license = 'BSD-2-Clause'
s.require_path = 'lib'
s.bindir = 'bin'
s.executables = ['anystyle']
s.required_ruby_version = '>= 2.3'
s.add_runtime_dependency('anystyle', '~>1.6')
s.add_runtime_dependency('gli', '~>2.17')
s.files = `git ls-files`.split("\n") - %w{
.gitignore
Gemfile
anystyle-cli.gemspec
}
end
# vim: syntax=ruby
pkgs/tools/misc/anystyle-cli/anystyle.gemspec
-52
View File
@@ -1,52 +0,0 @@
# -*- encoding: utf-8 -*-
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
require 'anystyle/version'
Gem::Specification.new do |s|
s.name = 'anystyle'
s.version = AnyStyle::VERSION.dup
s.platform = Gem::Platform::RUBY
s.authors = ['Sylvester Keil']
s.email = ['http://sylvester.keil.or.at']
s.homepage = 'http://anystyle.io'
s.summary = 'Smart and fast bibliography parser.'
s.description = 'A sophisticated parser for academic reference lists and bibliographies based on machine learning algorithms using conditional random fields.'
s.license = 'BSD-2-Clause'
s.executables = []
s.require_path = 'lib'
s.required_ruby_version = '>= 2.2'
s.add_runtime_dependency('bibtex-ruby', '~>5.0')
s.add_runtime_dependency('anystyle-data', '~>1.2')
s.add_runtime_dependency('gli', '~>2.17')
s.add_runtime_dependency('wapiti', '~>1.0', '>=1.0.2')
s.add_runtime_dependency('namae', '~>1.0')
s.files =
`git ls-files`.split("\n") - `git ls-files spec`.split("\n") - %w{
.coveralls.yml
.gitignore
.rspec
.simplecov
.travis.yml
Gemfile
Rakefile
appveyor.yml
anystyle.gemspec
res/core.xml
}
s.rdoc_options = %w{
--line-numbers
--inline-source
--title "AnyStyle"
--main README.md
}
s.extra_rdoc_files = %w{README.md LICENSE}
end
# vim: syntax=ruby
pkgs/tools/misc/anystyle-cli/default.nix
+8 -7
View File
@@ -9,13 +9,13 @@ let
deps = bundlerEnv rec {
name = "anystyle-cli-${version}";
source.sha256 = lib.fakeSha256;
version = "1.3.1";
version = "1.5.0";
inherit ruby;
gemdir = ./.;
gemset = lib.recursiveUpdate (import ./gemset.nix) {
anystyle.source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1w79zcia60nnnyrmyvpd10pmxrpk5c7lj9gmmblhwi8x5mfq9k0n";
sha256 = "C/OrU7guHzHdY80upEXRfhWmUYDxpI54NIvIjKv0znw=";
type = "gem";
};
};
@@ -25,8 +25,8 @@ buildRubyGem rec {
inherit ruby;
gemName = "anystyle-cli";
pname = gemName;
version = "1.3.1";
source.sha256 = "1a3ifwxwqkp5dnfk9r8qq8kgfb8k1pl7jjdghbb8ixbxz9ac7awy";
version = "1.5.0";
source.sha256 = "Bkk00PBk/6noCXgAbr1XUcdBq5vpdeL0ES02eeNA594=";
propagatedBuildInputs = [ deps ];
@@ -38,10 +38,11 @@ buildRubyGem rec {
description = "Command line interface to the AnyStyle Parser and Finder";
homepage = "https://anystyle.io/";
license = licenses.bsd2;
maintainers = with maintainers; [ shamilton ];
maintainers = with maintainers; [
aschleck
shamilton
];
mainProgram = "anystyle";
platforms = platforms.unix;
# error: passing argument 2 of 'rb_hash_foreach' from incompatible pointer type [-Wincompatible-pointer-types]
broken = true;
};
}
pkgs/tools/misc/anystyle-cli/gemset.nix
+208 -1994
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/system/collectd/default.nix
+27 -13
View File
@@ -1,33 +1,40 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
fetchpatch,
callPackage,
autoreconfHook,
pkg-config,
libtool,
bison,
flex,
perl,
nixosTests,
...
}@args:
let
plugins = callPackage ./plugins.nix args;
in
stdenv.mkDerivation rec {
version = "5.12.0";
stdenv.mkDerivation (finalAttrs: {
pname = "collectd";
version = "5.12.0";
src = fetchurl {
url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv";
src = fetchFromGitHub {
owner = "collectd";
repo = "collectd";
tag = "collectd-${finalAttrs.version}";
hash = "sha256-UTlCY1GPRpbdQFLFUDjNr1PgEdGv4WNtjr8TYbxHK5A=";
};
# All of these are going to be included in the next release
patches = [
# fix -t never printing syntax errors
# should be included in next release
(fetchpatch {
name = "fix-broken-dash-t-option.patch";
url = "https://github.com/collectd/collectd/commit/3f575419e7ccb37a3b10ecc82adb2e83ff2826e1.patch";
sha256 = "0jwjdlfl0dp7mlbwygp6h0rsbaqfbgfm5z07lr5l26z6hhng2h2y";
hash = "sha256-XkDxLITmG0FLpgf8Ut1bDqulM4DmPs8Xrec2QB1tkks=";
})
(fetchpatch {
name = "no_include_longintrepr.patch";
@@ -39,7 +46,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
autoreconfHook
bison
flex
perl # for pod2man
];
buildInputs = [
libtool
] ++ plugins.buildInputs;
@@ -52,9 +63,12 @@ stdenv.mkDerivation rec {
++ plugins.configureFlags
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-fp-layout=nothing" ];
# Used in `src/virt.c`
env.NIX_CFLAGS_COMPILE = "-DATTRIBUTE_UNUSED=__attribute__((unused))";
# do not create directories in /var during installPhase
postConfigure = ''
substituteInPlace Makefile --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#'
substituteInPlace Makefile --replace-fail '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#'
'';
postInstall = ''
@@ -69,11 +83,11 @@ stdenv.mkDerivation rec {
inherit (nixosTests) collectd;
};
meta = with lib; {
meta = {
description = "Daemon which collects system performance statistics periodically";
homepage = "https://collectd.org";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ bjornfor ];
};
}
})
pkgs/top-level/ocaml-packages.nix
-74
View File
@@ -918,80 +918,6 @@ let
import ../development/ocaml-modules/janestreet {
};
janeStreet_0_15 =
(lib.makeScope self.newScope (
self': with self'; {
# ocamlPackages that janestreet v0.15 packages depend on.
jsDeps =
let
uri-sexp = self.uri-sexp.override { inherit (self') ppx_sexp_conv sexplib0; };
cohttp = self.cohttp.override {
inherit (self') ppx_sexp_conv;
inherit uri-sexp;
};
ipaddr-sexp = self.ipaddr-sexp.override { inherit (self') ppx_sexp_conv; };
conduit = self.conduit.override {
inherit (self') ppx_sexp_conv sexplib;
inherit ipaddr-sexp;
};
conduit-async = self.conduit-async.override {
inherit (self')
async
ppx_sexp_conv
ppx_here
core
sexplib
async_ssl
;
inherit conduit ipaddr-sexp;
};
in
{
inherit (self)
dune-configurator
alcotest
re
num
octavius
uutf
ounit
ctypes
ctypes-foreign
;
ppxlib = self.ppxlib.override { inherit (self') stdio; };
cohttp-async = self.cohttp-async.override {
inherit (self')
ppx_sexp_conv
base
async
async_kernel
async_unix
core_unix
sexplib0
core
;
inherit uri-sexp cohttp conduit-async;
};
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix { };
};
janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix {
self = self' // jsDeps;
inherit ocaml;
inherit (pkgs)
bash
fetchpatch
fzf
lib
openssl
zstd
;
};
}
)).overrideScope
liftJaneStreet;
javalib = callPackage ../development/ocaml-modules/javalib { };
jingoo = callPackage ../development/ocaml-modules/jingoo { };