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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-05-01 18:25:43 +00:00
committed by GitHub
parent f783ef8651 b180442a65
commit e728a95a4a
96 changed files with 4687 additions and 4556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/monitoring/vmalert.nix
+4 -2
View File
@@ -25,14 +25,16 @@ let
in
attrsOf (either valueType (listOf valueType));
mkCliVal = value: if isPath value then "${value}" else toString value;
mkLine =
key: value:
if value == true then
"-${key}"
else if isList value then
concatMapStringsSep " " (v: "-${key}=${escapeShellArg (toString v)}") value
concatMapStringsSep " " (v: "-${key}=${escapeShellArg (mkCliVal v)}") value
else
"-${key}=${escapeShellArg (toString value)}";
"-${key}=${escapeShellArg (mkCliVal value)}";
vmalertName = name: "vmalert" + lib.optionalString (name != "") ("-" + name);
enabledInstances = lib.filterAttrs (name: conf: conf.enable) config.services.vmalert.instances;
nixos/modules/services/networking/nmtrust.nix
+20 -18
View File
@@ -30,28 +30,13 @@ let
# Generate Conflicts= for a target (all other trust targets)
conflictsFor = target: map (t: "${t}.target") (builtins.filter (t: t != target) trustTargets);
# Generate systemd unit overrides for a system unit.
# Uses StopWhenUnneeded instead of PartOf to avoid same-transaction
# issues: when transitioning between targets that both want a unit
# (e.g. offline -> trusted for allowOffline units), PartOf on the
# old target would stop the unit before WantedBy on the new target
# can restart it. StopWhenUnneeded only stops the unit when NO
# active target wants it.
mkSystemUnitOverrides =
unitName: unitCfg:
let
targets = [
"nmtrust-trusted.target"
]
++ lib.optional unitCfg.allowOffline "nmtrust-offline.target";
in
{
unitConfig.StopWhenUnneeded = true;
wantedBy = targets;
};
# Generate user unit overrides
mkUserUnitOverrides =
mkUnitOverrides =
unitName: unitCfg:
let
targets = [
@@ -316,7 +301,7 @@ in
systemd.services =
lib.mapAttrs' (name: value: {
name = lib.removeSuffix ".service" (lib.removeSuffix ".timer" (lib.removeSuffix ".socket" name));
value = mkSystemUnitOverrides name value;
value = mkUnitOverrides name value;
}) cfg.systemUnits
// {
nmtrust-apply = {
@@ -325,6 +310,8 @@ in
serviceConfig = {
Type = "oneshot";
ExecStart = "${trustHelper}/bin/nmtrust apply";
Restart = "on-failure";
RestartSec = "5";
ProtectSystem = "strict";
ReadWritePaths = [ "/run/nmtrust" ];
ProtectHome = true;
@@ -347,6 +334,8 @@ in
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${trustHelper}/bin/nmtrust apply";
Restart = "on-failure";
RestartSec = "5";
ProtectSystem = "strict";
ReadWritePaths = [ "/run/nmtrust" ];
ProtectHome = true;
@@ -358,6 +347,10 @@ in
# --- User unit overrides ---
# When the same unit appears under multiple users, union their wantedBy
# lists. systemd.user.services is system-wide, so per-user allowOffline
# differences are resolved by taking the most permissive value (any
# true wins).
systemd.user.services = lib.foldl' (
acc: username:
lib.foldl' (
@@ -366,10 +359,19 @@ in
strippedName = lib.removeSuffix ".service" (
lib.removeSuffix ".timer" (lib.removeSuffix ".socket" unitName)
);
incoming = mkUnitOverrides unitName cfg.userUnits.${username}.${unitName};
existing = acc'.${strippedName} or null;
in
acc'
// {
${strippedName} = mkUserUnitOverrides unitName cfg.userUnits.${username}.${unitName};
${strippedName} =
if existing == null then
incoming
else
existing
// {
wantedBy = lib.unique (existing.wantedBy ++ incoming.wantedBy);
};
}
) acc (builtins.attrNames cfg.userUnits.${username})
) { } userNames;
nixos/tests/calibre-web.nix
+3 -2
View File
@@ -3,6 +3,7 @@
let
port = 3142;
defaultPort = 8083;
libraryPath = "/var/lib/test-books";
in
{
name = "calibre-web";
@@ -16,7 +17,7 @@ in
enable = true;
listen.port = port;
options = {
calibreLibrary = "/tmp/books";
calibreLibrary = libraryPath;
reverseProxyAuth = {
enable = true;
header = "X-User";
@@ -30,7 +31,7 @@ in
start_all()
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
"mkdir -p ${libraryPath} && calibredb --library-path ${libraryPath} add -e --title test-book"
)
customized.succeed("systemctl restart calibre-web")
customized.wait_for_unit("calibre-web.service")
pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+3 -5
View File
@@ -12,13 +12,13 @@
}:
mkLibretroCore {
core = "mupen64plus-next";
version = "0-unstable-2026-03-03";
version = "0-unstable-2026-04-02";
src = fetchFromGitHub {
owner = "libretro";
repo = "mupen64plus-libretro-nx";
rev = "899eaf6d629b264fedc9afd45a5e01895045a90b";
hash = "sha256-FxRuCPMT3K0AeXj2/ZwgW7KQgB/iny1a9ydgGqnyfrQ=";
rev = "58b9daf940fb43f09c3984c6a7c730f4b4c24861";
hash = "sha256-9d1gbDDK2rOt/a9NNRQVJJmiE+UdohM/yPI5WstNmtA=";
};
# Fix for GCC 14
@@ -39,8 +39,6 @@ mkLibretroCore {
url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
})
# Fix for GCC 15. See https://github.com/libretro/GLideN64/pull/1.
./patches/mupen64plus-gcc-15.patch
];
extraNativeBuildInputs = [
pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/GLideN64/src/GLideNHQ/TxHiResLoader.h b/GLideN64/src/GLideNHQ/TxHiResLoader.h
index 4c13651..f887c78 100644
--- a/GLideN64/src/GLideNHQ/TxHiResLoader.h
+++ b/GLideN64/src/GLideNHQ/TxHiResLoader.h
@@ -13,6 +13,8 @@
#define CORRECTFILENAME(str)
#endif /* OS_WINDOWS */
+#include <cstdint>
+
#include "TxCache.h"
#include "TxQuantize.h"
#include "TxImage.h"
pkgs/applications/version-management/subversion/default.nix
+7 -4
View File
@@ -43,12 +43,12 @@ let
sha256,
extraPatches ? [ ],
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
inherit version;
pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}";
src = fetchurl {
url = "mirror://apache/subversion/subversion-${version}.tar.bz2";
url = "mirror://apache/subversion/subversion-${finalAttrs.version}.tar.bz2";
inherit sha256;
};
@@ -63,7 +63,8 @@ let
autoconf
libtool
python3
];
]
++ lib.optional perlBindings perl; # Needed for swig / EXTERN.h
buildInputs = [
zlib
@@ -82,6 +83,8 @@ let
++ lib.optional perlBindings perl
++ lib.optional saslSupport sasl;
strictDeps = true;
patches = [
./apr-1.patch
@@ -186,7 +189,7 @@ let
maintainers = [ ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
};
});
in
{
pkgs/build-support/vm/default.nix
+8 -12
View File
@@ -568,7 +568,7 @@ let
echo "unpacking RPMs..."
set +o pipefail
for i in $rpms; do
for i in "''${rpms[@]}"; do
echo "$i..."
${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional
done
@@ -585,7 +585,7 @@ let
echo "installing RPMs..."
PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} $rpms
rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} "''${rpms[@]}"
echo "running post-install script..."
eval "$postInstall"
@@ -730,7 +730,8 @@ let
memSize
;
debs = (lib.intersperse "|" debs);
debsFlat = lib.flatten debs;
debsGrouped = debs;
preVM = createEmptyImage { inherit size fullName; };
@@ -749,11 +750,9 @@ let
# (which have lots of circular dependencies) from barfing.
echo "unpacking Debs..."
for deb in $debs; do
if test "$deb" != "|"; then
echo "$deb..."
dpkg-deb --extract "$deb" /mnt
fi
for deb in "''${debsFlat[@]}"; do
echo "$deb..."
dpkg-deb --extract "$deb" /mnt
done
# Make the Nix store available in /mnt, because that's where the .debs live.
@@ -776,10 +775,7 @@ let
export DEBIAN_FRONTEND=noninteractive
oldIFS="$IFS"
IFS="|"
for component in $debs; do
IFS="$oldIFS"
for component in "''${debsGrouped[@]}"; do
echo
echo ">>> INSTALLING COMPONENT: $component"
debs=
pkgs/by-name/_2/_20kly/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
patchPhase = ''
substituteInPlace lightyears \
--replace \
--replace-fail \
"LIGHTYEARS_DIR = \".\"" \
"LIGHTYEARS_DIR = \"$out/share\""
'';
pkgs/by-name/_3/_3proxy/package.nix
+2 -2
View File
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
# Don't strip binary on install, we strip it on fixup phase anyway.
postPatch = ''
substituteInPlace Makefile.Linux \
--replace "(INSTALL_BIN) -s" "(INSTALL_BIN)" \
--replace "/usr" ""
--replace-fail "(INSTALL_BIN) -s" "(INSTALL_BIN)" \
--replace-fail "/usr" ""
'';
makeFlags = [
pkgs/by-name/_7/_7zip-zstd/package.nix
+1 -1
View File
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
''
+ lib.optionalString stdenv.hostPlatform.isMinGW ''
substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
--replace windres.exe ${stdenv.cc.targetPrefix}windres
--replace-fail windres.exe ${stdenv.cc.targetPrefix}windres
'';
buildPhase =
pkgs/by-name/_7/_7zz/package.nix
+1 -1
View File
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
--replace windres.exe ${stdenv.cc.targetPrefix}windres
--replace-fail windres.exe ${stdenv.cc.targetPrefix}windres
'';
env.NIX_CFLAGS_COMPILE = toString (
pkgs/by-name/_9/_9base/package.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
# the 9yacc script needs to be executed to build other items
preBuild = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
substituteInPlace ./yacc/9yacc \
--replace "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"
--replace-fail "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"
'';
enableParallelBuilding = true;
pkgs/by-name/_9/_9pfs/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
postPatch = ''
substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG"
substituteInPlace Makefile --replace-fail "pkg-config" "$PKG_CONFIG"
'';
makeFlags = [
pkgs/by-name/a2/a2jmidid/package.nix
+1 -1
View File
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control"
substituteInPlace $out/bin/a2j --replace-fail "a2j_control" "$out/bin/a2j_control"
'';
passthru.updateScript = gitUpdater { };
pkgs/by-name/a2/a2ps/package.nix
+2 -2
View File
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
};
postPatch = ''
substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm"
substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
substituteInPlace afm/make_fonts_map.sh --replace-fail "/bin/rm" "rm"
substituteInPlace tests/defs.in --replace-fail "/bin/rm" "rm"
'';
nativeBuildInputs = [
pkgs/by-name/aa/aaxtomp3/package.nix
+3 -3
View File
@@ -30,10 +30,10 @@ resholve.mkDerivation rec {
postPatch = ''
substituteInPlace AAXtoMP3 \
--replace 'AAXtoMP3' 'aaxtomp3'
--replace-fail 'AAXtoMP3' 'aaxtomp3'
substituteInPlace interactiveAAXtoMP3 \
--replace 'AAXtoMP3' 'aaxtomp3' \
--replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
--replace-fail 'AAXtoMP3' 'aaxtomp3' \
--replace-fail 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
'';
installPhase = ''
pkgs/by-name/ab/abcde/package.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf
substituteInPlace "abcde" \
--replace "/etc/abcde.conf" "$out/etc/abcde.conf"
--replace-fail "/etc/abcde.conf" "$out/etc/abcde.conf"
runHook postConfigure
'';
pkgs/by-name/ab/abi-dumper/package.nix
+3 -3
View File
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
patchPhase = ''
substituteInPlace abi-dumper.pl \
--replace eu-readelf ${elfutils}/bin/eu-readelf \
--replace vtable-dumper ${vtable-dumper}/bin/vtable-dumper \
--replace '"ctags"' '"${ctags}/bin/ctags"'
--replace-fail eu-readelf ${elfutils}/bin/eu-readelf \
--replace-fail vtable-dumper ${vtable-dumper}/bin/vtable-dumper \
--replace-fail '"ctags"' '"${ctags}/bin/ctags"'
'';
buildInputs = [
pkgs/by-name/ab/abuild/package.nix
+2 -2
View File
@@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
patchPhase = ''
substituteInPlace ./Makefile \
--replace 'chmod 4555' '#chmod 4555' \
--replace 'pkg-config' "$PKG_CONFIG"
--replace-fail 'chmod 4555' '#chmod 4555' \
--replace-fail 'pkg-config' "$PKG_CONFIG"
'';
makeFlags = [
pkgs/by-name/ac/acme-dns/package.nix
+1 -1
View File
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
postInstall = ''
install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
substituteInPlace $out/lib/systemd/system/acme-dns.service --replace "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
substituteInPlace $out/lib/systemd/system/acme-dns.service --replace-fail "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
'';
passthru.tests = { inherit (nixosTests) acme-dns; };
pkgs/by-name/ac/acme/package.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace Makefile \
--replace "= gcc" "?= gcc"
--replace-fail "= gcc" "?= gcc"
'';
enableParallelBuilding = true;
pkgs/by-name/ac/acpic/package.nix
+1 -1
View File
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
postPatch = ''
substituteInPlace setup.py \
--replace "pbr>=5.8.1,<6" "pbr"
--replace-fail "pbr>=5.8.1,<6" "pbr"
'';
nativeBuildInputs = with python3Packages; [
pkgs/by-name/ac/acpilight/package.nix
+2 -2
View File
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
);
postConfigure = ''
substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin
substituteInPlace Makefile --replace udevadm true
substituteInPlace 90-backlight.rules --replace-fail /bin ${coreutils}/bin
substituteInPlace Makefile --replace-fail udevadm true
'';
buildInputs = [ pyenv ];
pkgs/by-name/ac/activate-linux/package.nix
+1 -1
View File
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm444 res/icon.png $out/share/icons/hicolor/128x128/apps/activate-linux.png
install -Dm444 res/activate-linux.desktop -t $out/share/applications
substituteInPlace $out/share/applications/activate-linux.desktop \
--replace 'Icon=icon' 'Icon=activate-linux'
--replace-fail 'Icon=icon' 'Icon=activate-linux'
runHook postInstall
'';
pkgs/by-name/ac/actkbd/package.nix
+2 -2
View File
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
preConfigure = ''
substituteInPlace Makefile \
--replace /usr/local $out \
--replace /etc $out/etc
--replace-fail /usr/local $out \
--replace-fail /etc $out/etc
'';
postInstall = ''
pkgs/by-name/ad/adbfs-rootless/package.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# very ugly way of replacing the adb calls
substituteInPlace adbfs.cpp \
--replace '"adb ' '"${android-tools}/bin/adb '
--replace-fail '"adb ' '"${android-tools}/bin/adb '
'';
installPhase = ''
pkgs/by-name/ad/adcskiller/package.nix
+1 -1
View File
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication {
install -vD $pname.py $out/bin/$pname
substituteInPlace $out/bin/$pname --replace '"Coercer"' '"coercer"'
substituteInPlace $out/bin/$pname --replace-fail '"Coercer"' '"coercer"'
runHook postInstall
'';
pkgs/by-name/ad/adwaita-qt/package.nix
+1 -1
View File
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# Fix plugin dir
substituteInPlace src/style/CMakeLists.txt \
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
--replace-fail "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
'';
passthru = {
pkgs/by-name/ae/aeolus/package.nix
+1 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
sed -i source/Makefile -e /ldconfig/d
substituteInPlace source/main.cc --replace /etc/ "$out/etc/"
substituteInPlace source/main.cc --replace-fail /etc/ "$out/etc/"
'';
preBuild = "cd source";
pkgs/by-name/ae/aescrypt/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
preBuild = ''
substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc"
substituteInPlace src/Makefile --replace-fail "CC=gcc" "CC?=gcc"
cd src
'';
pkgs/by-name/af/afterstep/package.nix
+2 -14
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
# Causes fatal ldconfig cache generation attempt on non-NixOS Linux
for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do
substituteInPlace $mkfile \
--replace 'test -w /etc' 'false'
--replace-fail 'test -w /etc' 'false'
done
'';
@@ -72,20 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
# A strange type of bug: dbus is not immediately found by pkg-config
preConfigure = ''
# binutils 2.37 fix
# https://github.com/afterstep/afterstep/issues/2
fixupList=(
"autoconf/Makefile.defines.in"
"libAfterImage/aftershow/Makefile.in"
"libAfterImage/apps/Makefile.in"
"libAfterBase/Makefile.in"
"libAfterImage/Makefile.in"
)
for toFix in "''${fixupList[@]}"; do
substituteInPlace "$toFix" --replace "clq" "cq"
done
# A strange type of bug: dbus is not immediately found by pkg-config
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
'';
pkgs/by-name/ag/agg/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace include/agg_renderer_outline_aa.h \
--replace 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
--replace-fail 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
'';
# fix build with new automake, from Gentoo ebuild
pkgs/by-name/ai/airspy/package.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
substituteInPlace airspy-tools/CMakeLists.txt --replace-fail "/etc/udev/rules.d" "$out/etc/udev/rules.d"
'';
nativeBuildInputs = [
pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch
-14
View File
@@ -1,14 +0,0 @@
diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
index 949b80e..6ffcaa6 100644
--- a/cfitsio.pc.cmake
+++ b/cfitsio.pc.cmake
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir="@CMAKE_INSTALL_FULL_LIBDIR@"
+includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
Name: cfitsio
Description: FITS File Subroutine Library
pkgs/by-name/cf/cfitsio/package.nix
+2 -8
View File
@@ -11,24 +11,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cfitsio";
version = "4.6.3";
version = "4.6.4";
src = fetchFromGitHub {
owner = "HEASARC";
repo = "cfitsio";
tag = "cfitsio-${finalAttrs.version}";
hash = "sha256-nKxX3YNRJZpmcP8/0O2pMsYjcH6vzAWMpqaHYO+HoUo=";
hash = "sha256-8AFPTr8j8f+x1h78IXOV8GHkDPWvI8w8aRxyke3Dras=";
};
outputs = [
"bin"
"dev"
"out"
"doc"
];
patches = [
./cfitsio-pc-cmake.patch
];
nativeBuildInputs = [
@@ -68,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
# Fixup installation
# Remove installed test tools and benchmark
postInstall = ''
install -Dm644 -t "$out/share/doc/${finalAttrs.pname}" ../docs/*.pdf
rm "$out/bin/cookbook"
rmdir "$out/bin"
rm "$bin/bin/smem" "$bin/bin/speed"
pkgs/by-name/ch/chisel/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "chisel";
version = "1.11.5";
version = "1.11.6";
src = fetchFromGitHub {
owner = "jpillora";
repo = "chisel";
tag = "v${finalAttrs.version}";
hash = "sha256-9b4y09eStfVLGRGUHw1GicBWsWHy7j9nwhQ3kfmB8Wc=";
hash = "sha256-3pLqTOVJfp9MiorObS8I1KHB0MthzzK3oLFz+5emqxE=";
};
vendorHash = "sha256-hqHd+62csVjHY2oAvi5fwlI0LbjR/LSDg6b1SMwe8Fw=";
pkgs/by-name/di/difftastic/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "difftastic";
version = "0.68.0";
version = "0.69.0";
src = fetchFromGitHub {
owner = "wilfred";
repo = "difftastic";
tag = finalAttrs.version;
hash = "sha256-4CkAifz48qLegXTBmXqJe3+LAE1uCUUb28ZgXTVggOk=";
hash = "sha256-86aA9B/AaLKhHbaBKL6XpcqocghijCoxyrWUE5YOdaA=";
};
cargoHash = "sha256-MwoRr8aQAT5plkfapAY2oPrSYYmHGeqxOhCpOMEtUoc=";
cargoHash = "sha256-by/gl6qI6mc93Kxn0BdIhkL/gtoHcGwdzrGiT5KTmP4=";
buildInputs = [ rust-jemalloc-sys ];
pkgs/by-name/ex/exim/package.nix
+2 -2
View File
@@ -39,11 +39,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "exim";
version = "4.99.1";
version = "4.99.2";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/exim-${finalAttrs.version}.tar.xz";
hash = "sha256-6ulnvUml+HmTO4xuyIwwR1ocZkYjITXzfwW1XbxONEc=";
hash = "sha256-JTZPGZiCcNhGllaJ3SnGYs9d4VJjmHXQ1TUqaf11Okc=";
};
enableParallelBuilding = true;
pkgs/by-name/gf/gfxreconstruct/package.nix
+5 -6
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gfxreconstruct";
version = "1.0.4-unstable-2025-10-30";
version = "1.0.4-unstable-2026-04-29";
src = fetchFromGitHub {
owner = "LunarG";
repo = "gfxreconstruct";
rev = "4f1fa3aa9870b00404e6597283b2032a885303b3";
hash = "sha256-HwGmtkVQJirKikb37A/dQeEr3AWmqJMfBj46UKsS5m8=";
rev = "41c7f2d964544813df5988d9689189f8520b1e2e";
hash = "sha256-xtiNxKU0gJURN4FQBZyEX2VaDqvdiMoyDJZOoMafAgM=";
fetchSubmodules = true;
};
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
# The python script searches in subfolders, but we want to search in the same bin directory
prePatch = ''
substituteInPlace tools/gfxrecon/gfxrecon.py \
--replace "scriptdir, '..', cmd" 'scriptdir'
--replace-fail "scriptdir, '..', cmd" 'scriptdir'
'';
# Fix the paths to load the layer.
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
# does not try to start the wrapper bash scripts with python.
postInstall = ''
substituteInPlace $out/share/vulkan/explicit_layer.d/VkLayer_gfxreconstruct.json \
--replace 'libVkLayer_gfxreconstruct.so' "$out/lib/libVkLayer_gfxreconstruct.so"
--replace-fail 'libVkLayer_gfxreconstruct.so' "$out/lib/libVkLayer_gfxreconstruct.so"
for f in $out/bin/*.py; do
mv -- "$f" "''${f%%.py}"
done
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Graphics API Capture and Replay Tools";
homepage = "https://github.com/LunarG/gfxreconstruct/";
changelog = "https://github.com/LunarG/gfxreconstruct/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Flakebi ];
platforms = lib.platforms.linux;
pkgs/by-name/gl/glauth/package.nix
+1 -1
View File
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
meta = {
description = "Lightweight LDAP server for development, home use, or CI";
homepage = "https://github.com/glauth/glauth";
changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/glauth/glauth/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
bjornfor
pkgs/by-name/gp/gpupad/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gpupad";
version = "3.1.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "houmain";
repo = "gpupad";
tag = finalAttrs.version;
hash = "sha256-eZ9RhFPk7eV5xmp112E71xOc55GFkI0G8WTvyjxqGsM=";
hash = "sha256-7WdEdVe2lkCDHKkZpN3QTdQtsVWXdcQ3tdKd8vd1xAc=";
fetchSubmodules = true;
};
pkgs/by-name/ha/hackrf/package.nix
+3 -17
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
libusb1,
@@ -11,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hackrf";
version = "2024.02.1";
version = "2026.01.3";
src = fetchFromGitHub {
owner = "greatscottgadgets";
repo = "hackrf";
rev = "v${finalAttrs.version}";
sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
tag = "v${finalAttrs.version}";
sha256 = "sha256-/RSZ+jkh4wmb0n8Kiee9Nr5D6LPYdmZVigpsBagAaLg=";
};
nativeBuildInputs = [
@@ -30,14 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
fftwSinglePrec
];
patches = [
# CMake < 3.5 fix. Remove upon next version bump.
(fetchpatch {
url = "https://github.com/greatscottgadgets/hackrf/commit/5c394520403c40b656a7400681e4ae167943e43f.patch";
hash = "sha256-FRzb+Bt5fQm94d1EDbMv8oUFwD93VZQHFpQpMDe/BAA=";
})
];
cmakeFlags = [
"-DUDEV_RULES_GROUP=plugdev"
"-DUDEV_RULES_PATH=lib/udev/rules.d"
@@ -49,11 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
postPatch = ''
substituteInPlace host/cmake/modules/FindFFTW.cmake \
--replace "find_library (FFTW_LIBRARIES NAMES fftw3)" "find_library (FFTW_LIBRARIES NAMES fftw3f)"
'';
meta = {
description = "Open source SDR platform";
homepage = "https://greatscottgadgets.com/hackrf/";
pkgs/by-name/he/heroic-unwrapped/package.nix
+12 -6
View File
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
mkdir -p "$out/opt/heroic"
cp -r dist/linux-unpacked/resources "$out/opt/heroic"
cp -r dist/*-unpacked/resources "$out/opt/heroic"
bin_dir="$out/opt/heroic/resources/app.asar.unpacked/build/bin"
@@ -111,7 +111,13 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper "${lib.getExe electron}" "$out/bin/heroic" \
--inherit-argv0 \
--set ELECTRON_FORCE_IS_PACKAGED 1 \
--suffix PATH ":" "${umu-launcher}/bin" \
--suffix PATH ":" "${
lib.makeBinPath (
lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
umu-launcher
]
)
}" \
--add-flags --disable-gpu-compositing \
--add-flags $out/opt/heroic/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
@@ -141,10 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
baksa
];
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
# It may also work on other Linux targets, but all the game stores only
# support x86 Linux, so it would require extra hacking to run games via QEMU
# user emulation. Upstream provide Linux builds only for x86_64.
platforms = [ "x86_64-linux" ];
platforms = [
"aarch64-linux"
"x86_64-linux"
];
mainProgram = "heroic";
};
})
pkgs/by-name/hi/hickory-dns/package.nix
+4 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hickory-dns";
version = "0.26.0";
version = "0.26.1";
src = fetchFromGitHub {
owner = "hickory-dns";
repo = "hickory-dns";
tag = "v${finalAttrs.version}";
hash = "sha256-1VryKiE7kri7XQmVpCmZjc98L9iN60UVz5bNgphjDAU=";
hash = "sha256-jRcq9b409O5bjta8hFLFBFC6ILf8QA2EZ8tQqk2m1Rk=";
};
cargoHash = "sha256-El5NuGevzTpHJP5MVYjyED0UwV7xM9iwv/X7x5Gz/+I=";
cargoHash = "sha256-zszSkclNCLGVchWiNdtNLJeY2j5CmubjMjhwVwsvRP8=";
buildFeatures = [
"blocklist"
@@ -89,6 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
maintainers = with lib.maintainers; [
adamcstephens
colinsane
cpu
];
platforms = lib.platforms.linux;
license = with lib.licenses; [
pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Complex account balance assertions for hledger journals";
homepage = "https://hledger.org/";
changelog = "https://github.com/simonmichael/hledger/blob/master/CHANGES.md";
changelog = "https://github.com/simonmichael/hledger/blob/${version}/hledger/CHANGES.md";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.DamienCassou ];
platforms = lib.platforms.all; # GHC can cross-compile
pkgs/by-name/ht/html2text/gettext-0.25.patch
-29
View File
@@ -1,29 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index af28077..e746147 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
+SUBDIRS =
+
AM_YFLAGS = -d -Wno-yacc
bin_PROGRAMS = html2text
diff --git a/configure.ac b/configure.ac
index 999c6fe..30c2536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,11 @@
AC_PREREQ([2.71])
AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS])
+AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE([disable])
+AM_GNU_GETTEXT_VERSION([0.20])
+AM_GNU_GETTEXT([external])
AM_ICONV
#AC_CONFIG_SRCDIR([html.h])
#AC_CONFIG_HEADERS([config.h])
pkgs/by-name/ht/html2text/package.nix
+2 -9
View File
@@ -5,33 +5,26 @@
autoconf-archive,
autoreconfHook,
bison,
gettext,
libiconv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "html2text";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitLab {
owner = "grobian";
repo = "html2text";
rev = "v${finalAttrs.version}";
hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ=";
hash = "sha256-C229ogU2YStXWizb51whQXc6oSkVnclnOeJYlIMvHWM=";
};
nativeBuildInputs = [
autoconf-archive
autoreconfHook
bison
gettext
];
# These changes have all been made in HEAD, across several commits
# amongst other changes.
# See https://gitlab.com/grobian/html2text/-/merge_requests/57
patches = [ ./gettext-0.25.patch ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
meta = {
pkgs/by-name/in/influxdb/package.nix
+11 -9
View File
@@ -13,7 +13,7 @@ let
libflux_version = "0.196.1";
# This is copied from influxdb2 with the required flux version
flux = rustPlatform.buildRustPackage rec {
flux = rustPlatform.buildRustPackage (finalAttrs: {
pname = "libflux";
version = libflux_version;
src = fetchFromGitHub {
@@ -32,7 +32,7 @@ let
substituteInPlace flux-core/src/lib.rs \
--replace-fail "deny(warnings, missing_docs))]" "deny(warnings), allow(dead_code, mismatched_lifetime_syntaxes, unused_assignments))]"
'';
sourceRoot = "${src.name}/libflux";
sourceRoot = "${finalAttrs.src.name}/libflux";
cargoHash = "sha256-A6j/lb47Ob+Po8r1yvqBXDVP0Hf7cNz8WFZqiVUJj+Y=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -44,26 +44,28 @@ let
Cflags: -I/out/include
Libs: -L/out/lib -lflux -lpthread
'';
passAsFile = [ "pkgcfg" ];
postInstall = ''
mkdir -p $out/include $out/pkgconfig
cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
substitute $pkgcfgPath $out/pkgconfig/flux.pc \
printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
substituteInPlace $out/pkgconfig/flux.pc \
--replace-fail /out $out
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
'';
};
__structuredAttrs = true;
});
in
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "influxdb";
version = "1.12.2";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-Q05mKmAXxrk7IVNxUD8HHNKnWCxmNCdsr6NK7d7vOHM=";
};
@@ -87,7 +89,7 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.version=${finalAttrs.version}"
];
excludedPackages = "test";
@@ -104,4 +106,4 @@ buildGoModule rec {
zimbatm
];
};
}
})
pkgs/by-name/in/influxdb2-server/package.nix
+4 -2
View File
@@ -62,16 +62,18 @@ let
Cflags: -I/out/include
Libs: -L/out/lib -lflux -lpthread
'';
passAsFile = [ "pkgcfg" ];
postInstall = ''
mkdir -p $out/include $out/pkgconfig
cp -r $NIX_BUILD_TOP/${finalAttrs.src.name}/libflux/include/influxdata $out/include
substitute $pkgcfgPath $out/pkgconfig/flux.pc \
printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
substituteInPlace $out/pkgconfig/flux.pc \
--replace-fail /out $out
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
'';
__structuredAttrs = true;
});
in
buildGoModule {
pkgs/by-name/li/libcpucycles/environment-variable-tools.patch
+15 -18
View File
@@ -2,31 +2,27 @@ diff --git a/configure b/configure
index 87d5c14..5e2a1a4 100755
--- a/configure
+++ b/configure
@@ -112,21 +112,26 @@ def compilerversion(c):
@@ -120,21 +120,25 @@ def compilerversion(c):
except:
pass
-firstcompiler = None
-
-with open('compilers/default') as f:
- for c in f.readlines():
- c = c.strip()
- cv = compilerversion(c)
- if cv == None:
- print('skipping default compiler %s' % c)
- continue
- print('using default compiler %s' % c)
- firstcompiler = c
- break
-
-if firstcompiler is None:
- raise ValueError('did not find a working compiler')
+if c := os.getenv("CC"):
+ firstcompiler = c
+ print('using default compiler %s' % c)
+else:
+ firstcompiler = None
+
-with open('compilers/default') as f:
- for c in f.readlines():
- c = c.strip()
- cv = compilerversion(c)
- if cv == None:
- log('skipping default compiler %s' % c)
- continue
- log('using default compiler %s' % c)
- firstcompiler = c
- break
+ with open('compilers/default') as f:
+ for c in f.readlines():
+ c = c.strip()
@@ -37,10 +33,11 @@ index 87d5c14..5e2a1a4 100755
+ print('using default compiler %s' % c)
+ firstcompiler = c
+ break
+
-if firstcompiler is None:
- raise ValueError('did not find a working compiler')
+ if firstcompiler is None:
+ raise ValueError('did not find a working compiler')
+
with open('build/%s/scripts/compiledefault' % host,'w') as f:
f.write('#!/bin/sh\n')
pkgs/by-name/li/libcpucycles/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcpucycles";
version = "20250925";
version = "20260105";
src = fetchzip {
url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz";
hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM=";
hash = "sha256-hWmMLBadM/E/kF8D/cTjU+G0f2HTkZQlKoIWsgzAFj0=";
};
patches = [ ./environment-variable-tools.patch ];
pkgs/by-name/li/littlegptracker/package.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "djdiskmachine";
repo = "littlegptracker";
tag = finalAttrs.version;
hash = "sha256-SidrFsqAn0JQqthEoYA9H0RdF6jeCeP2Pe+UpAbbL48=";
hash = "sha256-j6r2iFJ3YJ3XOHwn/ENQmpZyIdMAdrWXd+EO3EWIBCw=";
};
nativeBuildInputs = [
pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch
-16
View File
@@ -2,14 +2,6 @@ diff --git a/lp_solve/ccc b/lp_solve/ccc
index bd5a938..7fe0427 100644
--- a/lp_solve/ccc
+++ b/lp_solve/ccc
@@ -1,6 +1,6 @@
:
src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
@@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
echo '#include <stdio.h>'>>"$MYTMP"/platform.c
echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
@@ -23,14 +15,6 @@ diff --git a/lpsolve55/ccc b/lpsolve55/ccc
index 999f5f6..ff69b17 100644
--- a/lpsolve55/ccc
+++ b/lpsolve55/ccc
@@ -1,6 +1,6 @@
:
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
@@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
echo '#include <stdio.h>'>>"$MYTMP"/platform.c
echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
pkgs/by-name/lp/lp_solve/package.nix
+10 -8
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
cctools,
fixDarwinDylibNames,
darwin,
@@ -12,11 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lp_solve";
version = "5.5.2.11";
version = "5.5.2.14";
src = fetchurl {
url = "mirror://sourceforge/project/lpsolve/lpsolve/${finalAttrs.version}/lp_solve_${finalAttrs.version}_source.tar.gz";
hash = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
src = fetchFromGitHub {
owner = "lp-solve";
repo = "lp_solve";
tag = finalAttrs.version;
hash = "sha256-mCYstt0vEGZk7rjcXmxqZjYTviF8xfg1mvA4jqKCYgE=";
};
nativeBuildInputs =
@@ -76,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Mixed Integer Linear Programming (MILP) solver";
mainProgram = "lp_solve";
homepage = "https://lpsolve.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
homepage = "https://github.com/lp-solve/lp_solve";
license = lib.licenses.lgpl21;
maintainers = with lib.maintainers; [ tbutter ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/ma/maigret/package.nix
+13 -9
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "maigret";
version = "0.5.0";
version = "0.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "soxoj";
repo = "maigret";
tag = "v${finalAttrs.version}";
hash = "sha256-y5b7t4ji72o1PXoqEQ0vNHqE1vwdkB/3gtsCj5GZ4Xg=";
hash = "sha256-3X8mRgsI0y1F/gUTWeYw83mQJKglJporpw7l9jI1Hvw=";
};
pythonRelaxDeps = true;
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
pythonRemoveDeps = [
"future-annotations"
"future"
"PyPDF2"
"six"
];
@@ -43,6 +44,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
chardet
cloudscraper
colorama
curl-cffi
flask
html5lib
idna
@@ -54,7 +56,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
networkx
platformdirs
pycountry
pypdf2
pypdf
pysocks
python-bidi
pyvis
@@ -86,18 +88,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
disabledTests = [
# Tests require network access
"test_check_features_manually_cloudflare"
"test_check_features_manually_success"
"test_detect_known_engine"
"test_dialog_adds_site_negative"
"test_dialog_adds_site_positive"
"test_dialog_replace_site"
"test_extract_ids_from_page"
"test_import_aiohttp_cookies"
"test_maigret_results"
"test_pdf_report"
"test_self_check_db_negative_enabled"
"test_self_check_db_positive_enable"
"test_detect_known_engine"
"test_check_features_manually_success"
"test_dialog_adds_site_positive"
"test_dialog_replace_site"
"test_dialog_adds_site_negative"
#
"test_twitter_graphql_probe_claimed_vs_unclaimed"
# Sandbox issue
"test_self_check_db"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+3 -3
View File
@@ -14,19 +14,19 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.151.0";
version = "1.152.0";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-Ha0GXVdOyAqBwC0iRX41kZSW9onutdsfkhn7z/fNai8=";
hash = "sha256-cjc9vC3sfsFaxcxEpXAAAza9/p3fk/2oCa4oB1fWAdA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-bEAXUoyerS7KjP1f15Z+5nktX1H7Mx4wATJBRfbJW+4=";
hash = "sha256-RwUsiS6JM5dmqquKVtyaBp67DYZys6Uecy0V6AabTk4=";
};
build-system =
pkgs/by-name/me/meshcentral/optionalDependencies.patch
+4244 -4153
View File
File diff suppressed because it is too large Load Diff
pkgs/by-name/me/meshcentral/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "meshcentral";
version = "1.1.57";
version = "1.1.59";
src = fetchFromGitHub {
owner = "Ylianst";
repo = "MeshCentral";
tag = finalAttrs.version;
hash = "sha256-tXv4AWFLBoaHraSTYbEuNjdxnB3tYyAYq5xPe4jRcmw=";
hash = "sha256-qfiIofwFOXHzxnqyJyXCgwMqBhONjBiU/5YLOE7u4n8=";
};
npmDepsHash = "sha256-vWCd+7SnQCf6iBhQboqMKL7TQRPxvt4DOe9+XJ8XJ1Y=";
npmDepsHash = "sha256-UYPx3OIeT1HUgyjY743F/DTwsfIRTlsQLJxK99LbA/k=";
# Using the npmDeps with a newer nodejs causes `npm ci` errors, also upstream
# states they stick to the LTS version of nodejs:
# https://meshcentral.com/docs/MeshCentral2InstallGuide.pdf
pkgs/by-name/na/natscli/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule (finalAttrs: {
pname = "natscli";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "nats-io";
repo = "natscli";
tag = "v${finalAttrs.version}";
hash = "sha256-RvAmILkVPGZ5NS50uXN2dUfelwIelSpgPpOaZJMpjWs=";
hash = "sha256-NF2A4bkGczaH+TYwQnLSvt21uQIk5FZomQuVl22CP30=";
};
proxyVendor = true;
vendorHash = "sha256-YjSURSY0oLdQWyBWoMe8V0sOrB2TXwmis/QUdB7T8E4=";
vendorHash = "sha256-yHLJWpdCUISdehE9nGiodHRrlnIR9j17ua1gBa3JGYA=";
subPackages = [ "nats" ];
pkgs/by-name/nm/nmtrust/package.nix
+6 -3
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
makeWrapper,
nixosTests,
shellcheck,
bash,
systemd,
@@ -13,7 +14,7 @@
stdenv.mkDerivation {
pname = "nmtrust";
version = "0.1.0";
version = "0.1.1";
strictDeps = true;
__structuredAttrs = true;
@@ -21,8 +22,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "brett";
repo = "nmtrust-nix";
rev = "v0.1.0";
hash = "sha256-7Cs00mCzByTKe7w5pnkkgqtZyUSaPa2r/5Uv133eZy0=";
rev = "v0.1.1";
hash = "sha256-niCbYxeunNxfkM/HEUiMAvwiholR0nmEPqssOOl9Qvo=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -51,6 +52,8 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru.tests = { inherit (nixosTests) nmtrust; };
meta = {
description = "Declarative network trust management for NixOS";
longDescription = ''
pkgs/by-name/ov/oversteer/package.nix
+6 -7
View File
@@ -34,18 +34,17 @@ let
]
);
version = "0.8.3";
in
stdenv.mkDerivation {
inherit version;
stdenv.mkDerivation (finalAttrs: {
version = "0.8.3";
pname = "oversteer";
src = fetchFromGitHub {
owner = "berarma";
repo = "oversteer";
rev = "v${version}";
sha256 = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
tag = "v${finalAttrs.version}";
hash = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
};
buildInputs = [
@@ -101,11 +100,11 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/berarma/oversteer";
changelog = "https://github.com/berarma/oversteer/releases/tag/${version}";
changelog = "https://github.com/berarma/oversteer/releases/tag/${finalAttrs.src.tag}";
description = "Steering Wheel Manager for Linux";
mainProgram = "oversteer";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.srounce ];
platforms = lib.platforms.unix;
};
}
})
pkgs/by-name/pi/picoc/gcc15-fixes.patch
+45
View File
@@ -0,0 +1,45 @@
--- a/interpreter.h
+++ b/interpreter.h
@@ -173,6 +173,7 @@ struct ValueType
};
/* function definition */
+typedef struct Value Value; /* Needed to allow reference before definition */
struct FuncDef
{
struct ValueType *ReturnType; /* the return value type */
@@ -180,7 +181,12 @@ struct FuncDef
int VarArgs; /* has a variable number of arguments after the explicitly specified ones */
struct ValueType **ParamType; /* array of parameter types */
char **ParamName; /* array of parameter names */
- void (*Intrinsic)(); /* intrinsic call address or NULL */
+ void (*Intrinsic)( /* intrinsic call address or NULL */
+ struct ParseState *Parser,
+ Value *ReturnValue,
+ Value **ParamArray,
+ int ArgCount
+ );
struct ParseState Body; /* lexical tokens of the function body if not intrinsic */
};
@@ -610,8 +616,8 @@ void IncludeFile(Picoc *pc, char *Filename);
* void PicocIncludeAllSystemHeaders(); */
/* debug.c */
-void DebugInit();
-void DebugCleanup();
+void DebugInit(Picoc *pc);
+void DebugCleanup(Picoc *pc);
void DebugCheckStatement(struct ParseState *Parser);
--- a/platform/library_unix.c
+++ b/platform/library_unix.c
@@ -1,6 +1,6 @@
#include "../interpreter.h"
-void UnixSetupFunc()
+void UnixSetupFunc(Picoc *pc)
{
}
pkgs/by-name/pi/picoc/package.nix
+2
View File
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
buildInputs = [ readline ];
patches = [ ./gcc15-fixes.patch ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
env.NIX_CFLAGS_COMPILE = toString (
pkgs/by-name/po/pocketbase/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "pocketbase";
version = "0.37.3";
version = "0.37.4";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${finalAttrs.version}";
hash = "sha256-n7oUsBMLKtFmz8iWu79vphBy7L9b7PMau8hOKKzi6Dc=";
hash = "sha256-d4JqA1iPPVA+wDS5Q3tJMUVnGvMFhK3JvuVLI7ZXvE0=";
};
vendorHash = "sha256-7Y7cn8t3HTV4vsTRXuM8gG0UjqCnxivQyo/KM47Itro=";
vendorHash = "sha256-PB95KUhHzkTDJZPXI0dU7SsupTprVufxukQN2OSy7mQ=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
pkgs/by-name/po/postgresqlTestHook/test.nix
+3 -1
View File
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
nativeCheckInputs = [ postgresql ];
dontUnpack = true;
doCheck = true;
passAsFile = [ "sql" ];
sql = ''
CREATE TABLE hello (
message text
@@ -23,6 +22,8 @@ stdenv.mkDerivation {
'';
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql <$sqlPath | grep 'it worked'
TEST_RAN=1
runHook postCheck
@@ -31,4 +32,5 @@ stdenv.mkDerivation {
[[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]]
touch $out
'';
__structuredAttrs = true;
}
pkgs/by-name/pr/prometheus-redis-exporter/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.82.0";
version = "1.83.0";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-zmJe3AQTYGDR2/reof0MRkN+JRx6jPKN98M4iGdAjUw=";
sha256 = "sha256-3KT5GsUxHG2t7C7aATo8MpAP5az663dBH5vHesDuBpQ=";
};
vendorHash = "sha256-ZiYyFEzG8Si5+sCYrqU0Ka1qogvbchsuDXQwsLo2c14=";
vendorHash = "sha256-hISPhsMn2NFmbD7Dg6ervAg5/YfcjLcUneimf9AOxb4=";
ldflags = [
"-X main.BuildVersion=${version}"
pkgs/by-name/re/redpanda-client/package.nix
+3 -3
View File
@@ -7,12 +7,12 @@
stdenv,
}:
let
version = "26.1.2";
version = "26.1.6";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-dY6orYo5t+l0xKEqnCrXiaQ/57rqJnn9RAP67EgDi98=";
sha256 = "sha256-XIYhSv30tNe/vS4x5lRax2n+sxy3EnuJfdg3IJHP+Ck=";
};
in
buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-0lxwIemmAdsnGjyF6dNc9YVPrc4VENxSYpcWRiF4KpI=";
vendorHash = "sha256-SiMh5Fi3uNOoKzPGEJ+sBkR/uIpci9mKONJiBG7wjtA=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/by-name/ri/river-classic/build.zig.zon.nix
+23 -7
View File
@@ -7,6 +7,14 @@
}:
linkFarm "zig-packages" [
{
name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se";
path = fetchgit {
url = "https://github.com/Vexu/arocc";
rev = "5f5a050569a95ecc40a426f0c3666ae7ef987ede";
hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw=";
};
}
{
name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
path = fetchzip {
@@ -15,17 +23,25 @@ linkFarm "zig-packages" [
};
}
{
name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
name = "translate_c-0.0.0-Q_BUWvP1BgCjAk6PWv5286tOlvzD9-X-NkuTzh0KxY0Q";
path = fetchgit {
url = "https://codeberg.org/ziglang/translate-c/";
rev = "7a1a9fdc4ab00835748a6657ecbb835e3d5d45f7";
hash = "sha256-zdZ/it+/yNGfszHLqpXpi20Gkwm8fduMMs1/l9oaje8=";
};
}
{
name = "wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1";
name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz";
hash = "sha256-QblQBVsDV2kSj31jqmVVi4hQUXuv8bsRgRMaCqlNxNM=";
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz";
hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE=";
};
}
{
name = "wlroots-0.20.1-jmOlcqNVBAB3uB5oqBTzpRlwu-FmMyyZMVAWCe5kmcSt";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.1.tar.gz";
hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk=";
};
}
{
pkgs/by-name/ri/river-classic/package.nix
+4 -5
View File
@@ -20,23 +20,22 @@
wlroots_0_20,
xwayland,
xwaylandSupport ? true,
zig_0_15,
zig_0_16,
}:
let
wlroots = wlroots_0_20;
zig = zig_0_15;
zig = zig_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "river-classic";
version = "0.3.15";
version = "0.3.17";
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
src = fetchFromCodeberg {
owner = "river";
repo = "river-classic";
hash = "sha256-zVUbLojSyCOOz3+DR9J9nQpNNuboG5/moCGjQx2ZI8w=";
hash = "sha256-+Geq3AetoiHB8xkMGf9nsYq8Mse2fZ5Edg1iOZ30f1A=";
tag = "v${finalAttrs.version}";
};
pkgs/by-name/sa/sawfish/package.nix
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = lib.platforms.unix;
platforms = lib.platforms.linux;
mainProgram = "sawfish";
};
})
pkgs/by-name/se/server-box/package.nix
+2 -2
View File
@@ -13,14 +13,14 @@
}:
let
version = "1.0.1365";
version = "1.0.1390";
src = fetchFromGitHub {
owner = "lollipopkit";
repo = "flutter_server_box";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-rZTQ3ZDWfVWHKLg/+uEDWE5KzLK01S/JCj1KhOGzZsA=";
hash = "sha256-LVGqvCVlPh1F3Lcdfp1BrTtgrAXRMfPeeCRZOpGeskA=";
};
in
flutter341.buildFlutterApplication {
pkgs/by-name/se/server-box/pubspec.lock.json
+14 -14
View File
@@ -184,11 +184,11 @@
"dependency": "transitive",
"description": {
"name": "camera_platform_interface",
"sha256": "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63",
"sha256": "7ac852d77699acee79f0d438b793feee26721841e50973576419ff5c6d95e9b7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.12.0"
"version": "2.13.0"
},
"camera_web": {
"dependency": "transitive",
@@ -377,7 +377,7 @@
"relative": true
},
"source": "path",
"version": "2.17.0"
"version": "2.17.1"
},
"dbus": {
"dependency": "transitive",
@@ -710,7 +710,7 @@
"version": "4.1.0"
},
"flutter_svg": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
@@ -1075,11 +1075,11 @@
"dependency": "transitive",
"description": {
"name": "local_auth_android",
"sha256": "b41970749c2d43791790724b76917eeee1e90de76e6b0eec3edca03a329bf44c",
"sha256": "b201c006fa769c23386f89aa6837ec0eb8179fcfb212eadcf87b422b3f9a6a78",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.7"
"version": "2.0.8"
},
"local_auth_darwin": {
"dependency": "transitive",
@@ -1305,11 +1305,11 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "914a07484c4380e572998d30486e77e0d9cd2faec72fee268086d07bf7f302c9",
"sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.0"
"version": "2.3.1"
},
"path_provider_foundation": {
"dependency": "transitive",
@@ -2070,11 +2070,11 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
"sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "15.0.2"
"version": "15.1.0"
},
"wake_on_lan": {
"dependency": "direct main",
@@ -2090,21 +2090,21 @@
"dependency": "direct main",
"description": {
"name": "wakelock_plus",
"sha256": "8b12256f616346910c519a35606fb69b1fe0737c06b6a447c6df43888b097f39",
"sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.1"
"version": "1.5.2"
},
"wakelock_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "wakelock_plus_platform_interface",
"sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03",
"sha256": "14b2e5b9e35c2631e656913c47adecdd71633ae92896a27a64c8f1fcfabc21cc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.5.0"
},
"watch_connectivity": {
"dependency": "direct main",
pkgs/os-specific/linux/sinit/default.nix → pkgs/by-name/si/sinit/package.nix
+6 -6
View File
@@ -2,19 +2,19 @@
lib,
stdenv,
fetchgit,
rcinit ? null,
rcshutdown ? null,
rcinit ? "/etc/rc.d/rc.init",
rcshutdown ? "/etc/rc.d/rc.shutdown",
rcreboot ? null,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "sinit";
version = "1.1";
src = fetchgit {
url = "https://git.suckless.org/sinit/";
sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
tag = "v${version}";
hash = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
tag = "v${finalAttrs.version}";
};
buildInputs = [
(lib.getOutput "static" stdenv.cc.libc)
@@ -41,4 +41,4 @@ stdenv.mkDerivation rec {
homepage = "https://tools.suckless.org/sinit";
downloadPage = "https://git.suckless.org/sinit";
};
}
})
pkgs/by-name/ta/talosctl/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "talosctl";
version = "1.12.7";
version = "1.13.0";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
tag = "v${finalAttrs.version}";
hash = "sha256-8RiEiOqWuFcE/cFUjm9EyC3HCK3QTFjSBudTW05XtdQ=";
hash = "sha256-dO4GBDhxsiuNn0lJl8RgFwUVxn34+Uks69Cm5J9zJsg";
};
vendorHash = "sha256-6n3h/RAp25IjFjVQ4g6tCJi6sEvKtj59BHdjdCnDl7E=";
vendorHash = "sha256-489ZbRoB7KhvrKfnfGEAw406zdMrkT/3fcw6LcAtFyo";
ldflags = [
"-s"
pkgs/os-specific/linux/trace-cmd/default.nix → pkgs/by-name/tr/trace-cmd/package.nix
+3 -3
View File
@@ -14,12 +14,12 @@
sourceHighlight,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "trace-cmd";
version = "3.4";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${finalAttrs.version}.tar.gz";
hash = "sha256-7IMInvVLIjGcHZvnSzhcne+4ieFa85ep7KMn2Oy9pF8=";
};
@@ -107,4 +107,4 @@ stdenv.mkDerivation rec {
wentasah
];
};
}
})
pkgs/by-name/up/upbound/package.nix
+1 -1
View File
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation {
meta = {
description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
changelog = "https://docs.upbound.io/reference/cli/rel-notes/#whats-changed";
changelog = "https://docs.upbound.io/reference/release-notes/up-cli";
homepage = "https://upbound.io";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
pkgs/by-name/ve/veryl/package.nix
+3 -3
View File
@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "veryl";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "veryl-lang";
repo = "veryl";
rev = "v${finalAttrs.version}";
hash = "sha256-X3DF1d2rYrdOc/M4Wwp0FnMK5GC33SlmHpjJ3hyeLso=";
hash = "sha256-ZHt62r/mxPRNG0nv9IqTtmR4V++K8e6ttJ1zDeVjv+Q=";
fetchSubmodules = true;
};
cargoHash = "sha256-0t2809LWMDU+IKWdxjd4kc+qyI8f/rIbWQ1C3f5BBwY=";
cargoHash = "sha256-aouhM9rbMmlm78k6LTT5UGpFFpYRJXCo/2pnuiIxQag=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/wl/wl-freeze/package.nix
+5 -1
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
makeWrapper,
installShellFiles,
jq,
procps,
psmisc,
@@ -26,7 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
installShellFiles
];
installPhase = ''
runHook preInstall
pkgs/by-name/zs/zsh-forgit/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zsh-forgit";
version = "26.04.2";
version = "26.05.0";
src = fetchFromGitHub {
owner = "wfxr";
repo = "forgit";
tag = finalAttrs.version;
hash = "sha256-/zFws4/QkAuoV2edtxW3jK1HbftigYNZzTkSg5Y4Phg=";
hash = "sha256-EFbzrVgLfVO+dEEQ1vZUcZkIszZFCktYjQjwkBVrHQI=";
};
strictDeps = true;
pkgs/development/libraries/qtspell/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Provides spell-checking to Qt's text widgets, using the enchant spell-checking library";
homepage = "https://github.com/manisandro/qtspell";
changelog = "https://github.com/manisandro/qtspell/blob/version/NEWS";
changelog = "https://github.com/manisandro/qtspell/blob/${version}/NEWS";
maintainers = with lib.maintainers; [ dansbandit ];
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
pkgs/development/python-modules/attrs-strict/default.nix
+5 -7
View File
@@ -26,6 +26,11 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-dDOD4Y57E+i8D0S4q+C6t7zjBTsS8q2UFiS22Dsp0Z8=";
};
patches = [
# Upstream PR: https://github.com/bloomberg/attrs-strict/pull/117
./fix-tests.patch
];
build-system = [
setuptools
setuptools-scm
@@ -41,13 +46,6 @@ buildPythonPackage (finalAttrs: {
pytestCheckHook
];
disabledTests = [
# AssertionError: Regex pattern did not match
"test_real_types"
"test_recursive"
"test_union_when_type_is_not_specified_raises"
];
meta = {
description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
homepage = "https://github.com/bloomberg/attrs-strict";
pkgs/development/python-modules/attrs-strict/fix-tests.patch
+73
View File
@@ -0,0 +1,73 @@
diff --git a/tests/test_auto_attribs__py3.py b/tests/test_auto_attribs__py3.py
index 67b3ff8..8241f9d 100644
--- a/tests/test_auto_attribs__py3.py
+++ b/tests/test_auto_attribs__py3.py
@@ -28,9 +28,13 @@ from attrs_strict import type_validator
None,
0xBAD,
"Value of value 2989 is not of type {}".format(
- "typing.Optional[str]"
- if sys.version_info == (2, 7) or sys.version_info > (3, 9)
- else "typing.Union[str, NoneType]"
+ "str | None"
+ if sys.version_info >= (3, 14)
+ else (
+ "typing.Optional[str]"
+ if sys.version_info == (2, 7) or sys.version_info > (3, 9)
+ else "typing.Union[str, NoneType]"
+ )
),
),
],
@@ -75,9 +79,13 @@ def test_recursive():
Self(Self())
Self(Self(None))
type_repr = (
- "typing.Optional[test_auto_attribs__py3.Self]"
- if sys.version_info == (2, 7) or sys.version_info > (3, 9)
- else "typing.Union[test_auto_attribs__py3.Self, NoneType]"
+ "test_auto_attribs__py3.Self | None"
+ if sys.version_info >= (3, 14)
+ else (
+ "typing.Optional[test_auto_attribs__py3.Self]"
+ if sys.version_info == (2, 7) or sys.version_info > (3, 9)
+ else "typing.Union[test_auto_attribs__py3.Self, NoneType]"
+ )
)
msg = f"Value of parent 17 is not of type {type_repr}"
with pytest.raises(ValueError, match=re.escape(msg)):
diff --git a/tests/test_union.py b/tests/test_union.py
index e1b11a9..49d7c20 100644
--- a/tests/test_union.py
+++ b/tests/test_union.py
@@ -16,16 +16,26 @@ from attrs_strict import type_validator
(
2.0,
Union[int, str],
- "Value of foo 2.0 is not of type typing.Union[int, str]",
+ (
+ "Value of foo 2.0 is not of type {}".format(
+ "int | str"
+ if sys.version_info >= (3, 14)
+ else "typing.Union[int, str]"
+ )
+ ),
),
(
[1, 2, "p"],
List[Union[None, int]],
(
"Value of foo p is not of type {} in [1, 2, 'p']".format(
- "typing.Optional[int]"
- if sys.version_info >= (3, 9)
- else "typing.Union[NoneType, int]"
+ "None | int"
+ if sys.version_info >= (3, 14)
+ else (
+ "typing.Optional[int]"
+ if sys.version_info >= (3, 9)
+ else "typing.Union[NoneType, int]"
+ )
)
),
),
pkgs/development/python-modules/elkm1-lib/default.nix
+8 -10
View File
@@ -8,23 +8,21 @@
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "elkm1-lib";
version = "2.2.13";
version = "2.2.14";
pyproject = true;
src = fetchFromGitHub {
owner = "gwww";
repo = "elkm1";
tag = version;
hash = "sha256-Z8OfaRggVkGzX7d/O8a7L110ophj3sKD2x5JskusUe8=";
tag = finalAttrs.version;
hash = "sha256-lejeRHteVMO7qz8qMPCG5d8V/rj550FL+WuogM/Lcbw=";
};
build-system = [ hatchling ];
dependencies = [
pyserial-asyncio-fast
];
dependencies = [ pyserial-asyncio-fast ];
nativeCheckInputs = [
pytest-asyncio
@@ -34,10 +32,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "elkm1_lib" ];
meta = {
description = "Python module for interacting with ElkM1 alarm/automation panel";
description = "Module for interacting with ElkM1 alarm/automation panel";
homepage = "https://github.com/gwww/elkm1";
changelog = "https://github.com/gwww/elkm1/blob/${version}/CHANGELOG.md";
changelog = "https://github.com/gwww/elkm1/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
pkgs/development/python-modules/json-stream/default.nix
+5 -5
View File
@@ -11,16 +11,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "json-stream";
version = "2.5.0";
version = "2.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "daggaz";
repo = "json-stream";
tag = "v${version}";
hash = "sha256-iSJY53VImv9GSIC2IB969zzYYNg7gFKJH8QQFpjzrQU=";
tag = "v${finalAttrs.version}";
hash = "sha256-fQuTvd2Kizy8icYoewvJJVDc7FXuXRQkwJfOCka3Eo4=";
};
build-system = [ setuptools ];
@@ -44,4 +44,4 @@ buildPythonPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
pkgs/development/python-modules/llama-index-llms-openai/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildPythonPackage (finalAttrs: {
pname = "llama-index-llms-openai";
version = "0.7.5";
version = "0.7.7";
pyproject = true;
src = fetchPypi {
pname = "llama_index_llms_openai";
inherit (finalAttrs) version;
hash = "sha256-VBI+Z5p83cHy6WnyeKRlQFBzDa+EaRcxoMU64U/qw8c=";
hash = "sha256-rp1vpf8ZguIY1ATDKLiDonbBI3ThsS2BEBrCVMvladE=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/mscerts/default.nix
+6 -6
View File
@@ -5,16 +5,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mscerts";
version = "2025.8.29";
version = "2026.4.30";
pyproject = true;
src = fetchFromGitHub {
owner = "ralphje";
repo = "mscerts";
tag = version;
hash = "sha256-K7U4dbhH3yWElSKRhU9mHU4W+Hdc6Vb9kf/TE4EJs8c=";
tag = finalAttrs.version;
hash = "sha256-S6YQt0PaY9OpFFrTcnHrak+8/x105Af7xLW5jln8GK0=";
};
build-system = [ setuptools ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
meta = {
description = "Makes the Microsoft Trusted Root Program's Certificate Trust Lists available in Python";
homepage = "https://github.com/ralphje/mscerts";
license = with lib.licenses; [ mpl20 ];
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ fab ];
};
}
})
pkgs/development/python-modules/netbox-bgp/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "netbox-bgp";
version = "0.18.0";
version = "0.18.1";
pyproject = true;
src = fetchFromGitHub {
owner = "netbox-community";
repo = "netbox-bgp";
tag = "v${version}";
hash = "sha256-Y2+TsGBpiBfj0e3mVdE2CjKlp0wX6zaFNcnc3gRKaHM=";
hash = "sha256-CLvtu4Xhja1hU48uAF1aEMNInc3FiworYvgGykQtWV4=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/netbox-dns/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
}:
buildPythonPackage rec {
pname = "netbox-plugin-dns";
version = "1.4.6";
version = "1.5.7";
pyproject = true;
src = fetchFromGitHub {
owner = "peteeckel";
repo = "netbox-plugin-dns";
tag = version;
hash = "sha256-+7I3Kahh2LtOytTg/vb8bFVubGbWMwfKUMUsUpApqGE=";
hash = "sha256-0H6ZFyPAoX7PuXQg95Y8uAVRnwZmLUVGe7W6ONVHJ/M=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/netbox-documents/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "netbox-documents";
version = "0.7.4";
version = "0.8.2";
pyproject = true;
src = fetchFromGitHub {
owner = "jasonyates";
repo = "netbox-documents";
tag = "v${version}";
hash = "sha256-Y1PmvoYwtVqQ8Ze7bSa5+Hb3B2W9clDXLOZzOqCvWZE=";
hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/netbox-interface-synchronization/default.nix
+2 -2
View File
@@ -19,14 +19,14 @@
buildPythonPackage (finalAttrs: {
pname = "netbox-interface-synchronization";
version = "4.1.7";
version = "4.5.8";
pyproject = true;
src = fetchFromGitHub {
owner = "NetTech2001";
repo = "netbox-interface-synchronization";
tag = finalAttrs.version;
hash = "sha256-02fdfE1BwpWsh21M0oP65kMAbFxDxYHsAEWA64rUl18=";
hash = "sha256-DZ1xOfHop/rASWbBzVILVqvll94tQM7tRiSXwOo/QQI=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/netbox-routing/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "netbox-routing";
version = "0.3.2";
version = "0.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "DanSheps";
repo = "netbox-routing";
tag = "v${version}";
hash = "sha256-HB07q6VO/PjbLLzKmHPMK91ZnppFtm9woQwdJIOFs5s=";
hash = "sha256-POnxnLES4Jub4u8pvpehMo0KfOCyAPGH83cRFRPgfOc=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/netbox-topology-views/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
}:
buildPythonPackage rec {
pname = "netbox-topology-views";
version = "4.5.0";
version = "4.5.1";
pyproject = true;
disabled = python.pythonVersion != netbox.python.pythonVersion;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "netbox-community";
repo = "netbox-topology-views";
tag = "v${version}";
hash = "sha256-1KEkNfo++lX0uF0xS9JOyG7dQBQYYo2cSGkjicJ5+vE=";
hash = "sha256-uKxIu8IPeEwBdRbtQaLWGwLnxvFyJ5FrScsU/ufyTuM=";
};
build-system = [ setuptools ];
pkgs/servers/sql/postgresql/ext/pgtap.nix
+3 -1
View File
@@ -35,7 +35,6 @@ postgresqlBuildExtension (finalAttrs: {
postgresqlTestHook
(postgresql.withPackages (_: [ finalAttrs.finalPackage ]))
];
passAsFile = [ "sql" ];
sql = ''
CREATE EXTENSION pgtap;
@@ -47,10 +46,13 @@ postgresqlBuildExtension (finalAttrs: {
'';
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql -a -v ON_ERROR_STOP=1 -f $sqlPath
runHook postCheck
'';
installPhase = "touch $out";
__structuredAttrs = true;
};
meta = {
pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
+3 -1
View File
@@ -22,7 +22,6 @@ stdenvNoCC.mkDerivation (
(postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
];
postgresqlTestUserOptions = "LOGIN SUPERUSER";
passAsFile = [ "sql" ];
sql =
sql
+ lib.concatMapStrings (
@@ -39,10 +38,13 @@ stdenvNoCC.mkDerivation (
) asserts;
checkPhase = ''
runHook preCheck
sqlPath=$TMPDIR/test.sql
printf "%s" "$sql" > $sqlPath
psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
runHook postCheck
'';
installPhase = "touch $out";
__structuredAttrs = true;
}
// lib.removeAttrs extraArgs [
"asserts"
pkgs/shells/fish/plugins/forgit.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildFishPlugin rec {
pname = "forgit";
version = "26.04.2";
version = "26.05.0";
src = fetchFromGitHub {
owner = "wfxr";
repo = "forgit";
rev = version;
hash = "sha256-/zFws4/QkAuoV2edtxW3jK1HbftigYNZzTkSg5Y4Phg=";
hash = "sha256-EFbzrVgLfVO+dEEQ1vZUcZkIszZFCktYjQjwkBVrHQI=";
};
postInstall = ''
pkgs/top-level/all-packages.nix
-7
View File
@@ -3383,8 +3383,6 @@ with pkgs;
ttp = with python3.pkgs; toPythonApplication ttp;
trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
translatepy = with python3.pkgs; toPythonApplication translatepy;
@@ -8608,11 +8606,6 @@ with pkgs;
protobuf = protobuf_33;
};
sinit = callPackage ../os-specific/linux/sinit {
rcinit = "/etc/rc.d/rc.init";
rcshutdown = "/etc/rc.d/rc.shutdown";
};
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
}; # sysdig is a client, for a driver look at linuxPackagesFor