Merge master into staging-nixos
This commit is contained in:
@@ -24521,6 +24521,12 @@
|
||||
github = "siph";
|
||||
githubId = 6619112;
|
||||
};
|
||||
siphc = {
|
||||
name = "siphc";
|
||||
github = "siphc";
|
||||
githubId = 42943030;
|
||||
email = "ayfpan@ucla.edu";
|
||||
};
|
||||
sir4ur0n = {
|
||||
github = "sir4ur0n";
|
||||
githubId = 1204125;
|
||||
|
||||
@@ -87,6 +87,7 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = rec {
|
||||
Type = "notify";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
DynamicUser = true;
|
||||
|
||||
@@ -1408,6 +1408,7 @@ in
|
||||
rspamd-trainer = runTest ./rspamd-trainer.nix;
|
||||
rss-bridge = handleTest ./web-apps/rss-bridge { };
|
||||
rss2email = handleTest ./rss2email.nix { };
|
||||
rstp = runTest ./rstp.nix;
|
||||
rstudio-server = runTest ./rstudio-server.nix;
|
||||
rsync = runTest ./rsync.nix;
|
||||
rsyncd = runTest ./rsyncd.nix;
|
||||
|
||||
@@ -55,24 +55,6 @@
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
specialisation.eth1-rstp.configuration = {
|
||||
networking.bridges.br0 = {
|
||||
interfaces = [ "eth1" ];
|
||||
rstp = lib.mkForce true;
|
||||
};
|
||||
|
||||
networking.interfaces = {
|
||||
eth1.ipv4.addresses = lib.mkForce [ ];
|
||||
eth1.ipv6.addresses = lib.mkForce [ ];
|
||||
br0.ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.1.2";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -100,19 +82,6 @@
|
||||
"grep eth1 /run/br0.interfaces >&2",
|
||||
)
|
||||
|
||||
# activating rstp needs another service, therefore the bridge will restart and the container will lose its connectivity
|
||||
# with subtest("Bridged configuration with STP"):
|
||||
# client.succeed("/run/booted-system/specialisation/eth1-rstp/bin/switch-to-configuration test >&2")
|
||||
# client.execute("ip -4 a >&2")
|
||||
# client.execute("ip l >&2")
|
||||
#
|
||||
# client.succeed(
|
||||
# "ping 192.168.1.122 -c 1 -n >&2",
|
||||
# "nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2",
|
||||
# "ip l show eth1 |grep 'master br0' >&2",
|
||||
# "grep eth1 /run/br0.interfaces >&2",
|
||||
# )
|
||||
|
||||
with subtest("Reverting to initial configuration preserves connectivity"):
|
||||
client.succeed(
|
||||
"/run/booted-system/bin/switch-to-configuration test >&2"
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "rstp";
|
||||
|
||||
nodes = {
|
||||
client = {
|
||||
containers = {
|
||||
peer = {
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostBridge = "br0";
|
||||
|
||||
config = {
|
||||
networking = {
|
||||
interfaces = {
|
||||
eth0 = {
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.1.122";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
bridges = {
|
||||
br0 = {
|
||||
interfaces = [ ];
|
||||
rstp = true;
|
||||
};
|
||||
};
|
||||
|
||||
interfaces = {
|
||||
eth1 = {
|
||||
ipv4.addresses = lib.mkForce [ ];
|
||||
ipv6.addresses = lib.mkForce [ ];
|
||||
};
|
||||
|
||||
br0 = {
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.1.2";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
vlans = [ 1 ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
client.start()
|
||||
client.wait_for_unit("default.target")
|
||||
client.wait_until_succeeds("journalctl | grep 'Port vb-peer : up'", timeout=10)
|
||||
'';
|
||||
}
|
||||
@@ -8,6 +8,7 @@
|
||||
}:
|
||||
runCommand "sddm-wrapped"
|
||||
{
|
||||
pname = "sddm";
|
||||
inherit (sddm-unwrapped) version outputs;
|
||||
|
||||
buildInputs = sddm-unwrapped.buildInputs ++ extraPackages;
|
||||
|
||||
@@ -145,14 +145,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
# The build system uses custom logic - defined in
|
||||
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
|
||||
# library, which doesn't pick up the package in the nix store. We
|
||||
# additionally need to set the path via the NLOPT environment variable.
|
||||
NLOPT = nlopt;
|
||||
|
||||
# prusa-slicer uses dlopen on `libudev.so` at runtime
|
||||
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
|
||||
env = {
|
||||
# The build system uses custom logic - defined in
|
||||
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
|
||||
# library, which doesn't pick up the package in the nix store. We
|
||||
# additionally need to set the path via the NLOPT environment variable.
|
||||
NLOPT = nlopt;
|
||||
}
|
||||
// lib.optionalAttrs withSystemd {
|
||||
# prusa-slicer uses dlopen on `libudev.so` at runtime
|
||||
NIX_LDFLAGS = "-ludev";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# for cffi
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
env.LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
glib
|
||||
gobject-introspection
|
||||
gdk-pixbuf
|
||||
|
||||
@@ -45,7 +45,9 @@ let
|
||||
dirName = "WolframEngine";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (l10n) version name src;
|
||||
pname = "wolfram-engine";
|
||||
|
||||
inherit (l10n) version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
||||
"SVN_INCLUDE=${subversion.dev}/include/subversion-1"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lsvn_fs-1";
|
||||
env.NIX_LDFLAGS = "-lsvn_fs-1";
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
||||
@@ -26,8 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
swiftpm
|
||||
];
|
||||
|
||||
# Can't find libdispatch without this on NixOS. (swift 5.8)
|
||||
LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
# Can't find libdispatch without this on NixOS. (swift 5.8)
|
||||
LD_LIBRARY_PATH = "${swiftPackages.Dispatch}/lib";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
echo "export function registerLinuxConfig() {}" > $linuxConfigFilename
|
||||
|
||||
# disable auto update
|
||||
sed -i 's/[^=]*\.auto_update_disabled/true/' $out/resources/app/build/main/main-entry-*.mjs
|
||||
sed -i 's/auto_update_disabled:[^,}]*/auto_update_disabled:true/g' $out/resources/app/build/main/main-entry-*.mjs
|
||||
|
||||
# prevent updates
|
||||
sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-temp";
|
||||
version = "0.3.5";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yozhgoor";
|
||||
repo = "cargo-temp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kCiw3a9C78mcJ2/bX+E5gXZKYcfLXF0crMIZu4cJsdY=";
|
||||
hash = "sha256-F7KIYEWZN4KAVoBRquL7/VH0p+MSFGO0n2PkbXljyPM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7S7L/OKHTOAP9tbM7+xWhvcYBZScvX6SBW3U1AyFGrs=";
|
||||
cargoHash = "sha256-ho5HriiViW2FxxPz4RA1nCkmlG7cdt5VuhVrSdGzzuY=";
|
||||
|
||||
meta = {
|
||||
description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";
|
||||
|
||||
@@ -37,14 +37,14 @@ with py.pkgs;
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.499";
|
||||
version = "3.2.500";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = version;
|
||||
hash = "sha256-1jb+ot8m7MS+BvXL7QakBHoViEmk+eORVmlmBJDfAtM=";
|
||||
hash = "sha256-pjoWUEJbB5onlprYOjl8diVolM29kXf0GS9eebV+o9o=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-files";
|
||||
version = "34";
|
||||
version = "35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-files";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nxlPzNrX3mAwhR8mpRfoZ7d6tdfVOBEaTtzEHU14p68=";
|
||||
hash = "sha256-ziFtsWZPdzkqc3UEaoIfwsIe8q/H0lyLtEropA2w+pc=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-machines";
|
||||
version = "346";
|
||||
version = "347";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-machines";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fsEmxJ/9w4NbjgKhb4JTFY94FFTc735+ZQ8YieLQVpA=";
|
||||
hash = "sha256-VXxR6/6nPaWA2FwT/bViu1FQAgqs0Jya1IyN5Oodfow=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-podman";
|
||||
version = "119.1";
|
||||
version = "120";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-podman";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XAOHkul9oh1mUJ27ghJgZLtriBGjofyoGhQ3gb7Gunc=";
|
||||
hash = "sha256-1PXz+zHuj5fjzDe194+sgBlLhQnS9jzv9FbM9RfNIVc=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
buildEnv,
|
||||
dejavu_fonts,
|
||||
}:
|
||||
|
||||
buildEnv {
|
||||
inherit (dejavu_fonts) pname version;
|
||||
paths = [ dejavu_fonts.out ];
|
||||
}
|
||||
@@ -4,31 +4,36 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
libx11,
|
||||
makeWrapper,
|
||||
xsel,
|
||||
wl-clipboard,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "discordo";
|
||||
version = "0-unstable-2025-12-06";
|
||||
version = "0-unstable-2026-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayn2op";
|
||||
repo = "discordo";
|
||||
rev = "a9359209369cf816bdab76d4feeb8270a5410040";
|
||||
hash = "sha256-Dudlghaz3RGZaHSExyzmeVUZufU8w1ONSE3nh/GINHQ=";
|
||||
rev = "415c534674064305625f97a8ba42c4da0ad8f2e9";
|
||||
hash = "sha256-epodX3renaAdzqKsYux65LX671M6u3uHvh/EViQqAQg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IFZcBq58qLRmU0eDrPNh/vEL3L+FZX1AHS09vtWmRaQ=";
|
||||
vendorHash = "sha256-2Y+IBDklxro75rFImKjMecr/eK6jSquKidy4hfpguYY=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
env.CGO_ENABLED = 1;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
];
|
||||
|
||||
# Clipboard support on X11 and Wayland
|
||||
# Clipboard support on X11
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libx11
|
||||
];
|
||||
|
||||
# Clipboard support on Wayland
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
makeWrapper
|
||||
];
|
||||
@@ -37,7 +42,6 @@ buildGoModule (finalAttrs: {
|
||||
wrapProgram $out/bin/discordo \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
xsel
|
||||
wl-clipboard
|
||||
]
|
||||
}
|
||||
@@ -51,7 +55,10 @@ buildGoModule (finalAttrs: {
|
||||
description = "Lightweight, secure, and feature-rich Discord terminal client";
|
||||
homepage = "https://github.com/ayn2op/discordo";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ arian-d ];
|
||||
maintainers = with lib.maintainers; [
|
||||
arian-d
|
||||
siphc
|
||||
];
|
||||
mainProgram = "discordo";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "languagetool-rust";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeertmans";
|
||||
repo = "languagetool-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LHlM+PJbBqsgOwK9Mw8oVVP+dq4IBFhxjRaXLIGxZPg=";
|
||||
hash = "sha256-zH93Pi/zVnCLo8O/1HnSTfUOu9vtzF3JSzn+1/1/Oz0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VfvdIjNIHpvN370/3y2XXxaIyEL9+tG0OcnONhs9Z2I=";
|
||||
cargoHash = "sha256-e75srZlKx/WfxbguyIu7MWZm33WuOfDubGqfvviN1HA=";
|
||||
|
||||
buildFeatures = [ "full" ];
|
||||
|
||||
|
||||
@@ -74,15 +74,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = lib.optional (
|
||||
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
|
||||
) "--undefined-version";
|
||||
env = {
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
|
||||
{
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = "--undefined-version";
|
||||
};
|
||||
|
||||
stripDebugList = [
|
||||
"bin"
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.137.0";
|
||||
version = "2.139.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-G9wuefSt4OEFIM8rHLSyBY8t+jxgKPt4T+KQF6Jh3Tk=";
|
||||
hash = "sha256-sTqa/UOKkZodwSPnxkjxjz15xrr1VSCuAiO3bmzsbQU=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libfyaml";
|
||||
version = "0.9";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantoniou";
|
||||
repo = "libfyaml";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Id5pdFzjA9q67okfESO3LZH8jIz93mVgIEEuBbPjuGI=";
|
||||
hash = "sha256-bq8ikZMI92Cn0TMGmQwyZpKt+8D4E8FrbrwAD7dK6Ws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonDS";
|
||||
version = "1.0-unstable-2025-11-06";
|
||||
version = "1.1-unstable-2026-01-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "220b238ec06692ee144bb1f50867a2edb8795de1";
|
||||
hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";
|
||||
rev = "73b38200fd0fa81b0bd4b3c1d2f9395a6ec5ac0b";
|
||||
hash = "sha256-/JnAf+qknOaGl3RcRzCFIh4dFIcHxTwu8Woju+d0nUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,32 +8,39 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mstpd";
|
||||
version = "0.0.8";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mstpd";
|
||||
repo = "mstpd";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb";
|
||||
hash = "sha256-m4gbVXAPIYGQvTFaSziFuOO6say5kgUsk7NSdqXgKmA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-strncpy-gcc9.patch";
|
||||
url = "https://github.com/mstpd/mstpd/commit/d27d7e93485d881d8ff3a7f85309b545edbe1fc6.patch";
|
||||
sha256 = "19456daih8l3y6m9kphjr7pj7slrqzbj6yacnlgznpxyd8y4d86y";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=$(out)"
|
||||
"--sysconfdir=$(out)/etc"
|
||||
"--sbindir=$(out)/sbin"
|
||||
"--sbindir=$(out)/bin"
|
||||
"--libexecdir=$(out)/lib"
|
||||
"--with-bashcompletiondir=$(out)/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
# bridge-stp is a helper called by the kernel whenever STP is enabled/disabled
|
||||
# on a bridge - the built-in version is incompatible with NixOS, so there's no
|
||||
# point keeping it around.
|
||||
#
|
||||
# An alternative script gets automatically generated by NixOS network module
|
||||
# whenever a bridge needs mstpd (grep for `bridgeStp`).
|
||||
postInstall = ''
|
||||
rm $out/bin/bridge-stp
|
||||
|
||||
# Remove now-dangling symlinks, too
|
||||
rm $out/bin/mstp_restart
|
||||
rm $out/lib/mstpctl-utils/mstpctl_restart_config
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Multiple Spanning Tree Protocol daemon";
|
||||
homepage = "https://github.com/mstpd/mstpd";
|
||||
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
libpcap
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
env.LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
libpcap
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
pname = "nixtamal";
|
||||
version = "0.1.1-beta";
|
||||
version = "0.2.0-beta";
|
||||
release_year = 2026;
|
||||
|
||||
minimalOCamlVersion = "5.3";
|
||||
@@ -25,7 +25,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
url = "https://darcs.toastal.in.th/nixtamal/stable/";
|
||||
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-8HrW7VH2LAcTyduGfToC3+oqU7apILdvgd76c8r8NIw=";
|
||||
hash = "sha256-73V2j281tfQroRTUbMQAdRdKOTW4x1Nm1u8Vj3aCR2k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -93,14 +93,14 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
mainProgram = "nixtamal";
|
||||
homepage = "https://nixtamal.toast.al";
|
||||
changelog = "https://nixtamal.toast.al/changelog/";
|
||||
description = "Fulfilling, pure input pinning for Nix";
|
||||
description = "Fulfilling input pinning for Nix";
|
||||
longDescription = ''
|
||||
Nixtamal’s keys features
|
||||
|
||||
• Automate the manual work of input pinning, allowing to lock & refresh inputs
|
||||
• Declaritive KDL manifest file over imperative CLI flags
|
||||
• Host, forge, VCS-agnostic
|
||||
• Fetchers from Nixpkgs not supported by the builtins (currently Darcs, Pijul)
|
||||
• Choose eval time fetchers (builtins) or build time fetchers (Nixpkgs, default) — which opens up fetching Darcs & Pijul
|
||||
• Supports mirrors
|
||||
• Override hash algorithm on a per-project & per-input basis — including BLAKE3 support
|
||||
• Custom freshness commands
|
||||
|
||||
@@ -16,7 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isMusl musl-fts;
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isMusl {
|
||||
NIX_LDFLAGS = "-lfts";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
sh Build.sh -r -tpax
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
openssl
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
env.LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
sqlite
|
||||
libzip
|
||||
curl
|
||||
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 pgloader-bundle-${finalAttrs.version}/bin/pgloader "$out/bin/pgloader"
|
||||
wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${finalAttrs.LD_LIBRARY_PATH}"
|
||||
wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${finalAttrs.env.LD_LIBRARY_PATH}"
|
||||
mkdir -p $out/bin $out/man/man1
|
||||
installManPage source/docs/_build/man/*.1
|
||||
'';
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "sha256-frISiZ89ei7XfI5F2nJJehfQZsk0Mlb4n91q/AiZ2vA=";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lfftw3_threads";
|
||||
env.NIX_LDFLAGS = "-lfftw3_threads";
|
||||
|
||||
patches = [
|
||||
# proper pthread return value (https://github.com/clearscene/pHash/pull/20)
|
||||
|
||||
@@ -45,7 +45,9 @@ stdenv.mkDerivation rec {
|
||||
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lintl";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-lintl";
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
||||
@@ -45,15 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk2
|
||||
];
|
||||
|
||||
RTE_SDK = dpdk;
|
||||
GUI = lib.optionalString withGtk "true";
|
||||
env = {
|
||||
RTE_SDK = dpdk;
|
||||
GUI = lib.optionalString withGtk "true";
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=sign-compare"
|
||||
];
|
||||
|
||||
# requires symbols from this file
|
||||
NIX_LDFLAGS = "-lrte_net_bond";
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=sign-compare"
|
||||
];
|
||||
# requires symbols from this file
|
||||
NIX_LDFLAGS = "-lrte_net_bond";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu
|
||||
|
||||
@@ -92,18 +92,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fiddle~.c prevents building with gcc15. Upstream puredata has fixed this issue,
|
||||
|
||||
@@ -147,7 +147,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString withLDAP "-llber";
|
||||
env = lib.optionalAttrs withLDAP {
|
||||
NIX_LDFLAGS = "-llber";
|
||||
};
|
||||
|
||||
installTargets = [ "non-interactive-package" ];
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lcrypt";
|
||||
env.NIX_LDFLAGS = "-lcrypt";
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=$(out)/etc"
|
||||
|
||||
@@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
swiftPackages.Dispatch
|
||||
];
|
||||
|
||||
# swiftpm fails to found libdispatch.so on Linux
|
||||
LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
lib.makeLibraryPath [
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
# swiftpm fails to found libdispatch.so on Linux
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
swiftPackages.Dispatch
|
||||
]
|
||||
);
|
||||
];
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lwayqt-utils-qt6";
|
||||
env.NIX_LDFLAGS = "-lwayqt-utils-qt6";
|
||||
|
||||
meta = {
|
||||
description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors";
|
||||
|
||||
@@ -52,28 +52,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libXrandr
|
||||
];
|
||||
|
||||
# JUCE dlopens these at runtime, standalone executable crashes without them
|
||||
NIX_LDFLAGS = [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
env = {
|
||||
# JUCE dlopens these at runtime, standalone executable crashes without them
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# juce, compiled in this build as part of a Git submodule, uses `-flto` as
|
||||
# a Link Time Optimization flag, and instructs the plugin compiled here to
|
||||
# use this flag to. This breaks the build for us. Using _fat_ LTO allows
|
||||
# successful linking while still providing LTO benefits. If our build of
|
||||
# `juce` was used as a dependency, we could have patched that `-flto` line
|
||||
# in our juce's source, but that is not possible because it is used as a
|
||||
# Git Submodule.
|
||||
"-ffat-lto-objects"
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
# Fontconfig error: Cannot load default config file: No such file: (null)
|
||||
FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "s-tui";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amanusk";
|
||||
repo = "s-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VdQSDRDdRO6jHSuscOQZXnVM6nWHaXRfR4sZ3x5lriI=";
|
||||
hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {
|
||||
substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'"
|
||||
'';
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
env.LD_LIBRARY_PATH = lib.makeLibraryPath [
|
||||
libX11
|
||||
libXext
|
||||
libXfixes
|
||||
|
||||
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
configureFlags = [ "--with-fftw=${fftwSinglePrec.dev}" ];
|
||||
|
||||
NIX_LDFLAGS = "-lopenal";
|
||||
env.NIX_LDFLAGS = "-lopenal";
|
||||
|
||||
meta = {
|
||||
homepage = "http://scorched3d.co.uk/";
|
||||
|
||||
@@ -15,9 +15,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-7BQM7dFZl5OD1g2+h6AVHCwSraeHkQlaj6hK5jW5MCY=";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux [
|
||||
"-lgcc_s"
|
||||
];
|
||||
env =
|
||||
lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
NIX_LDFLAGS = toString [ "-lgcc_s" ];
|
||||
}
|
||||
// lib.optionalAttrs stdenv.cc.isClang {
|
||||
# Borrowed solution from homebrew: https://github.com/Homebrew/homebrew-core/blob/1c7c95183c0984a84b1680422afab6578c300a27/Formula/s/siege.rb#L31
|
||||
CFLAGS = "-Wno-int-conversion";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
@@ -33,9 +38,6 @@ stdenv.mkDerivation rec {
|
||||
"--with-zlib=${zlib.dev}"
|
||||
];
|
||||
|
||||
# Borrowed solution from homebrew: https://github.com/Homebrew/homebrew-core/blob/1c7c95183c0984a84b1680422afab6578c300a27/Formula/s/siege.rb#L31
|
||||
CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion";
|
||||
|
||||
meta = {
|
||||
description = "HTTP load tester";
|
||||
homepage = "https://www.joedog.org/siege-home/";
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
scalapack
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lm";
|
||||
env.NIX_LDFLAGS = "-lm";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
|
||||
@@ -22,13 +22,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [ ./bash-completion.patch ];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
|
||||
# `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
|
||||
# TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s";
|
||||
env = {
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of
|
||||
# `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here
|
||||
# TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
|
||||
@@ -93,7 +93,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-lX11";
|
||||
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://icculus.org/smpeg/";
|
||||
|
||||
@@ -120,18 +120,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Socalabs Nintendo Gameboy PAPU Emulation Plugin";
|
||||
|
||||
@@ -117,18 +117,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Socalabs NES Ricoh 2A03 Emulation Plugin";
|
||||
|
||||
@@ -152,18 +152,16 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Socalabs Commodore 64 SID Emulation Plugin";
|
||||
|
||||
@@ -127,18 +127,16 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -130,18 +130,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcomposite"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
"-lXtst"
|
||||
"-lXdmcp"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -77,15 +77,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = (
|
||||
toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
]
|
||||
);
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
rev-prefix = "release_xt_";
|
||||
|
||||
@@ -41,12 +41,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export LD_LIBRARY_PATH=${subversion.out}/lib
|
||||
'';
|
||||
|
||||
# -fcommon: workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
|
||||
# `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-I ${subversion.dev}/include/subversion-1 -fcommon";
|
||||
NIX_LDFLAGS = "-lsvn_client-1 -lsvn_subr-1";
|
||||
env = {
|
||||
# -fcommon: workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
|
||||
# `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-I ${subversion.dev}/include/subversion-1"
|
||||
"-fcommon"
|
||||
];
|
||||
NIX_LDFLAGS = toString [
|
||||
"-lsvn_client-1"
|
||||
"-lsvn_subr-1"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "FUSE filesystem for accessing Subversion repositories";
|
||||
|
||||
@@ -54,7 +54,9 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl";
|
||||
|
||||
# Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool"
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation";
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-framework Foundation";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://sylpheed.sraoss.jp/en/";
|
||||
|
||||
@@ -60,15 +60,18 @@ stdenv.mkDerivation rec {
|
||||
"--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = lib.optional (
|
||||
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
|
||||
) "--undefined-version";
|
||||
env = {
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
|
||||
{
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = "--undefined-version";
|
||||
};
|
||||
|
||||
# this must not be exported before the ConfigurePhase otherwise waf whines
|
||||
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
|
||||
@@ -83,15 +83,18 @@ stdenv.mkDerivation rec {
|
||||
else
|
||||
null;
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = lib.optional (
|
||||
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
|
||||
) "--undefined-version";
|
||||
env = {
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
|
||||
{
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = "--undefined-version";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Trivial database";
|
||||
|
||||
@@ -21,13 +21,13 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uutils-coreutils";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-U9godsxtyWOFhrE8CaQesWoeKWmitADp2jyJU/1fPKA=";
|
||||
hash = "sha256-/GLDcqbNRO2NV+tW5yRZ0BdGJ+R3S3CPBPuBXpCIWuU=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname src version;
|
||||
hash = "sha256-V53qD7SujN8bEdNwcBshdkNeYdk+4Whr+XiYHO1iLXs=";
|
||||
hash = "sha256-DrDfbf7UMEeNRvCHsu1Kbr+4PWkckmMvy8sEpjEgJfg=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayscriber";
|
||||
version = "0.9.9";
|
||||
version = "0.9.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devmobasa";
|
||||
repo = "wayscriber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ObAaR9PP8wY98ZP7nenyGhAXbyd+vb5hiR/cmJTD4CQ=";
|
||||
hash = "sha256-t7BXAIYkebaf3DpcSUCFc1+0YyazhZfsJAzwyPaJ+aM=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
pango
|
||||
libxkbcommon
|
||||
];
|
||||
cargoHash = "sha256-yPwtMuvulqgshbppxoZv3HtutvKPGskVRF+p5E+KFvI=";
|
||||
cargoHash = "sha256-QCZ0izvrWqFbVk6Nu5La1wgYrG+vMIlhHxlMipjoInA=";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "zoekt";
|
||||
version = "3.7.2-2-unstable-2025-11-20";
|
||||
version = "0-unstable-2026-01-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "zoekt";
|
||||
rev = "2e375df04f81c31c2ea62c23fcff48d98240e131";
|
||||
hash = "sha256-tKuLJ/n9qI20FMmCtyuVeRfnB08ZY2KbRKdcjpe66u4=";
|
||||
rev = "c747a3bccc2a4a427204ac08eea62a522df6d2ec";
|
||||
hash = "sha256-fIvDxOTPbtRqBX39Lfezy/q235/nPhog/UIEncdV9UQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uHCZNbP1zY8V+rtIB8xATWEci99sQkf8M01p3m789ZA=";
|
||||
vendorHash = "sha256-1QM6OVFXS88IryKuNJKcbgYZcRZ+E6Na5NqItAlicXw=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
|
||||
@@ -540,7 +540,8 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (
|
||||
{
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
pname = name;
|
||||
|
||||
buildInputs = [
|
||||
tarWrapper
|
||||
python
|
||||
|
||||
@@ -17,17 +17,14 @@
|
||||
|
||||
let
|
||||
inherit (lib) optionals versionOlder;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
|
||||
pname = "vg";
|
||||
version = "0.9.5";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
url = "https://erratique.ch/software/vg/releases/vg-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw=";
|
||||
};
|
||||
|
||||
@@ -71,11 +68,11 @@ stdenv.mkDerivation {
|
||||
Renderers for PDF, SVG and the HTML canvas are distributed with the
|
||||
module. An API allows to implement new renderers.
|
||||
'';
|
||||
homepage = webpage;
|
||||
homepage = "https://erratique.ch/software/vg";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.jirkamarsik ];
|
||||
mainProgram = "vecho";
|
||||
inherit (ocaml.meta) platforms;
|
||||
broken = versionOlder ocaml.version "4.14";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastgit";
|
||||
version = "0.0.1";
|
||||
version = "0.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AnswerDotAI";
|
||||
repo = "fastgit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zpX8Y8Cuoeh8oeYJjZOD2KZByu7OUwOva546gBP5iZs=";
|
||||
hash = "sha256-l843vKDC3RZGMhmnvPxAQPkvXPGQwmuqe310j/2e2pM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "growattserver";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indykoning";
|
||||
repo = "PyPi_GrowattServer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc=";
|
||||
hash = "sha256-CTIc+LROas7RGf9BzGl8hasS512LsNXcDnzLu0DD+Bk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202602011";
|
||||
version = "0.1.202602021";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oYGU8RrphOysbrZ002CF2kraAzWSZNnpLskDCZ66kHY=";
|
||||
hash = "sha256-310x0g6TBy64Svj8aO5vvmCFWaL4txA6rZLXxSrxL2g=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "incomfort-client";
|
||||
version = "0.6.11";
|
||||
version = "0.6.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zxdavb";
|
||||
repo = "incomfort-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HCawa+eFpC0t/dC8fQ+teMaPpuxrYBprEV8SxnhZ1ls=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5IP0R7NI+TXBOPwDZ26inVC6YxhYozo4ZM/V7w73EvQ=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -37,8 +37,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python module to poll Intergas boilers via a Lan2RF gateway";
|
||||
homepage = "https://github.com/zxdavb/incomfort-client";
|
||||
changelog = "https://github.com/jbouwh/incomfort-client/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/jbouwh/incomfort-client/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyhik";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mezz64";
|
||||
repo = "pyHik";
|
||||
tag = version;
|
||||
hash = "sha256-dDUaNeE0wjKsojeezKVWfMBPO+7O5e2QFOHnh3UoFbY=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ree2UbGfmz4Xs0aRiAWcOnCEpnrjR11PBmo/hMnbnlI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -44,4 +44,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,21 +8,21 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pymeteoclimatic";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrianmo";
|
||||
repo = "pymeteoclimatic";
|
||||
tag = version;
|
||||
hash = "sha256-rP0+OYDnQ4GuoV7DzR6jtgH6ilTMLjdaEFJcz3L0GYQ=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Yln+uUwnb5mlPS3uRRzpAH6kSc9hU2jEnhk/3ifiwWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
lxml
|
||||
];
|
||||
@@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python wrapper around the Meteoclimatic service";
|
||||
homepage = "https://github.com/adrianmo/pymeteoclimatic";
|
||||
changelog = "https://github.com/adrianmo/pymeteoclimatic/releases/tag/${version}";
|
||||
license = with lib.licenses; [ mit ];
|
||||
changelog = "https://github.com/adrianmo/pymeteoclimatic/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rmsd";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dhLsFGts45PitSVZxXw5FND3EOeHHWYrH8PZJEYoq+M=";
|
||||
hash = "sha256-blEDbbrGtOz067Jq24QMBU5P8otmBwnUl8Tpjvc7TLo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,7 +17,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (subunit) name src meta;
|
||||
inherit (subunit)
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
pyproject = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.41";
|
||||
version = "3.1.42";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-egzZfCjTeMViZKe7hoMcvQjexOsTNNkIQu+Ms0M3UnA=";
|
||||
hash = "sha256-YUE0fppBbZ8ivBpeCsavRyU3DjqlhZA5zLwchfrCrJQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -364,8 +364,8 @@ rec {
|
||||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_9 = mkGradle {
|
||||
version = "9.3.0";
|
||||
hash = "sha256-DVhfadoJH8Wyvs7Yd/6rVaMGTUO4odRq6weZawkV4OA=";
|
||||
version = "9.3.1";
|
||||
hash = "sha256-smbV/2uQ6tptw7IMsJDjcxMC5VOifF0+TfHw12vq/wY=";
|
||||
defaultJava = jdk21;
|
||||
};
|
||||
gradle_8 = mkGradle {
|
||||
|
||||
@@ -40,7 +40,7 @@ let
|
||||
icu73
|
||||
];
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [ icu73 ];
|
||||
env.LD_LIBRARY_PATH = lib.makeLibraryPath [ icu73 ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-system-editline"
|
||||
|
||||
@@ -11,7 +11,8 @@ let
|
||||
let
|
||||
perl' = perl.withPackages f;
|
||||
finalPackage = buildEnv {
|
||||
name = "${postgresql.pname}-plperl-${postgresql.version}";
|
||||
pname = "${postgresql.pname}-plperl";
|
||||
inherit (postgresql) version;
|
||||
paths = [ postgresql.plperl ];
|
||||
passthru = {
|
||||
inherit withPackages;
|
||||
|
||||
@@ -11,7 +11,8 @@ let
|
||||
let
|
||||
python = python3.withPackages f;
|
||||
finalPackage = buildEnv {
|
||||
name = "${postgresql.pname}-plpython3-${postgresql.version}";
|
||||
pname = "${postgresql.pname}-plpython3";
|
||||
inherit (postgresql) version;
|
||||
paths = [ postgresql.plpython3 ];
|
||||
passthru = {
|
||||
inherit withPackages;
|
||||
|
||||
@@ -13,7 +13,8 @@ let
|
||||
pkgs = f tclPackages;
|
||||
paths = lib.concatMapStringsSep " " (pkg: "${pkg}/lib") pkgs;
|
||||
finalPackage = buildEnv {
|
||||
name = "${postgresql.pname}-pltcl-${postgresql.version}";
|
||||
pname = "${postgresql.pname}-pltcl";
|
||||
inherit (postgresql) version;
|
||||
paths = [ postgresql.pltcl ];
|
||||
passthru = {
|
||||
inherit withPackages;
|
||||
|
||||
@@ -9481,12 +9481,6 @@ with pkgs;
|
||||
|
||||
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
|
||||
|
||||
# solve collision for nix-env before https://github.com/NixOS/nix/pull/815
|
||||
dejavu_fontsEnv = buildEnv {
|
||||
name = dejavu_fonts.name;
|
||||
paths = [ dejavu_fonts.out ];
|
||||
};
|
||||
|
||||
docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
|
||||
|
||||
docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
|
||||
|
||||
Reference in New Issue
Block a user