Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-11-06 06:05:03 +00:00
committed by GitHub
46 changed files with 867 additions and 362 deletions
+5 -6
View File
@@ -9151,12 +9151,6 @@
githubId = 30196;
name = "Ian Liu Rodrigues";
};
ianmjones = {
email = "ian@ianmjones.com";
github = "ianmjones";
githubId = 4710;
name = "Ian M. Jones";
};
ianwookim = {
email = "ianwookim@gmail.com";
github = "wavewave";
@@ -9537,6 +9531,11 @@
github = "istoph";
githubId = 114227790;
};
istudyatuni = {
name = "Ilia";
github = "istudyatuni";
githubId = 43654815;
};
itepastra = {
name = "Noa Aarts";
github = "itepastra";
+12 -3
View File
@@ -62,7 +62,10 @@ in
ControllerMode = "bredr";
};
};
description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).";
description = ''
Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
See <https://github.com/bluez/bluez/blob/master/src/main.conf> for full list of options.
'';
};
input = mkOption {
@@ -74,7 +77,10 @@ in
ClassicBondedOnly = true;
};
};
description = "Set configuration for the input service (/etc/bluetooth/input.conf).";
description = ''
Set configuration for the input service (/etc/bluetooth/input.conf).
See <https://github.com/bluez/bluez/blob/master/profiles/input/input.conf> for full list of options.
'';
};
network = mkOption {
@@ -85,7 +91,10 @@ in
DisableSecurity = true;
};
};
description = "Set configuration for the network service (/etc/bluetooth/network.conf).";
description = ''
Set configuration for the network service (/etc/bluetooth/network.conf).
See <https://github.com/bluez/bluez/blob/master/profiles/network/network.conf> for full list of options.
'';
};
};
};
@@ -73,8 +73,9 @@ let
openvpn-restart = {
wantedBy = [ "sleep.target" ];
path = [ pkgs.procps ];
script = "pkill --signal SIGHUP --exact openvpn";
#SIGHUP makes openvpn process to self-exit and then it got restarted by systemd because of Restart=always
script = let
unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers);
in "systemctl try-restart ${lib.escapeShellArgs unitNames}";
description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep";
};
};
@@ -41,7 +41,7 @@ buildGoModule rec {
homepage = "https://github.com/muesli/deckmaster";
changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
@@ -39,14 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
stripRoot = false;
};
# for sbcl 2.4.3
postPatch = ''
substituteInPlace _build/cl-gobject-introspection/src/init.lisp \
--replace-warn sb-ext::set-floating-point-modes sb-int:set-floating-point-modes
substituteInPlace _build/fset/Code/port.lisp \
--replace-warn sb-ext::once-only sb-int:once-only
'';
nativeBuildInputs = [ wrapGAppsHook3 ];
buildInputs = [
@@ -58,6 +58,7 @@ let
# expressvpnd binary has hard-coded the path /sbin/sysctl hence below workaround.
extraBuildCommands = ''
mkdir -p sbin
chmod +w sbin
ln -s ${sysctl}/bin/sysctl sbin/sysctl
'';
@@ -22,6 +22,7 @@
, sqlite
, xdg-desktop-portal
, libseccomp
, glycin-loaders
}:
stdenv.mkDerivation rec {
@@ -44,6 +45,14 @@ stdenv.mkDerivation rec {
};
};
# Dirty approach to add patches after cargoSetupPostUnpackHook
# We should eventually use a cargo vendor patch hook instead
preConfigure = ''
pushd ../$(stripHash $cargoDeps)/glycin-2.*
patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
popd
'';
nativeBuildInputs = [
glib
gtk4
@@ -77,6 +86,12 @@ stdenv.mkDerivation rec {
gst-plugins-good
]);
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
)
'';
passthru = {
updateScript = nix-update-script { };
};
@@ -82,6 +82,7 @@ rec {
pysocks
qrcode
requests
setuptools
stem
unidecode
waitress
+15 -25
View File
@@ -19,36 +19,24 @@
}:
let
version = "3.1";
version = "3.2";
src = fetchFromGitLab {
owner = "World";
repo = "apostrophe";
domain = "gitlab.gnome.org";
rev = "v${version}";
hash = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc=";
rev = "refs/tags/v${version}";
hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ=";
};
# Patches are required by upstream. Without the patches
# typing `- aaa`, newline, `- bbb` the program crashes
gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: {
patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ];
});
libspelling-patched =
(libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs
(prev: {
patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ];
});
reveal-js = fetchFromGitHub {
owner = "hakimel";
repo = "reveal.js";
# keep in sync with upstream shipped version
# in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json
rev = "4.6.0";
hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ=";
rev = "refs/tags/5.1.0";
hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0=";
};
in
python3Packages.buildPythonApplication {
@@ -67,13 +55,14 @@ python3Packages.buildPythonApplication {
+ ''
substituteInPlace apostrophe/preview_converter.py \
--replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js"
''
# Should be done in postInstall, but meson checks this eagerly before build
+ ''
install -d $out/share/apostrophe/libs
cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js
'';
# Should be done in postInstall, but meson checks this eagerly before build
preConfigure = ''
install -d $out/share/apostrophe/libs
cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js
'';
nativeBuildInputs = [
meson
ninja
@@ -85,8 +74,8 @@ python3Packages.buildPythonApplication {
buildInputs = [
libadwaita
gtksourceview5-patched
libspelling-patched
gtksourceview5
libspelling
webkitgtk_6_0
];
@@ -94,6 +83,7 @@ python3Packages.buildPythonApplication {
pygobject3
pypandoc
chardet
levenshtein
];
dontWrapGApps = true;
@@ -107,7 +97,7 @@ python3Packages.buildPythonApplication {
'';
passthru = {
inherit gtksourceview5-patched libspelling-patched reveal-js;
inherit reveal-js;
};
meta = {
@@ -1,17 +1,23 @@
{ lib
, stdenv
, cmake
, ninja
, circt
, llvm
, python3
}: stdenv.mkDerivation {
{
lib,
stdenv,
cmake,
ninja,
circt,
llvm,
python3,
}:
stdenv.mkDerivation {
pname = circt.pname + "-llvm";
inherit (circt) version src;
requiredSystemFeatures = [ "big-parallel" ];
nativeBuildInputs = [ cmake ninja python3 ];
nativeBuildInputs = [
cmake
ninja
python3
];
preConfigure = ''
cd llvm/llvm
@@ -30,7 +36,11 @@
"-DLLVM_INSTALL_UTILS=ON"
];
outputs = [ "out" "lib" "dev" ];
outputs = [
"out"
"lib"
"dev"
];
# Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev
# in circt) so that we only have to remove the one fixed rpath.
@@ -70,7 +80,7 @@
#
# Inspired by fixDarwinDylibNames.
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
local flags=(-delete_rpath @loader_path/../lib)
local flags
for file in "$lib"/lib/*.dylib; do
flags+=(-change @rpath/"$(basename "$file")" "$file")
done
@@ -1,15 +1,16 @@
{ stdenv
, lib
, cmake
, coreutils
, python3
, git
, fetchFromGitHub
, ninja
, lit
, z3
, gitUpdater
, callPackage
{
stdenv,
lib,
cmake,
coreutils,
python3,
git,
fetchFromGitHub,
ninja,
lit,
z3,
gitUpdater,
callPackage,
}:
let
@@ -29,7 +30,13 @@ stdenv.mkDerivation rec {
requiredSystemFeatures = [ "big-parallel" ];
nativeBuildInputs = [ cmake ninja git pythonEnv z3 ];
nativeBuildInputs = [
cmake
ninja
git
pythonEnv
z3
];
buildInputs = [ circt-llvm ];
cmakeFlags = [
@@ -65,7 +72,17 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "check-circt check-circt-integration";
outputs = [ "out" "lib" "dev" ];
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path
mkdir -pv $lib/lib
cp -v ./lib/libarc-jit-env.dylib $lib/lib
'';
outputs = [
"out"
"lib"
"dev"
];
# Copy circt-llvm's postFixup stage so that it can make all our dylib references
# absolute as well.
@@ -89,7 +106,11 @@ stdenv.mkDerivation rec {
description = "Circuit IR compilers and tools";
homepage = "https://circt.org/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ];
maintainers = with lib.maintainers; [
sharzy
pineapplehunter
sequencer
];
platforms = lib.platforms.all;
};
}
+54
View File
@@ -0,0 +1,54 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.29.4";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "refs/tags/v${version}";
hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
rm -r $out/tests/fixtures
'';
};
cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo=";
checkFlags = [
# Skip interactive tests
"--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only"
"--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion"
"--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"
"--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top"
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Tool to conveniently learn about the disk usage of directories";
homepage = "https://github.com/Byron/dua-cli";
changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [
figsoda
killercup
];
mainProgram = "dua";
};
}
+54
View File
@@ -0,0 +1,54 @@
{
lib,
buildGoModule,
fetchFromGitHub,
git,
makeWrapper,
}:
let
pname = "gitopper";
version = "0.0.16";
in
buildGoModule {
inherit pname version;
src = fetchFromGitHub {
owner = "miekg";
repo = "gitopper";
rev = "v${version}";
hash = "sha256-EAOC54VtGx6axfty5m8JOebcayINTy4cP4NBo5+ioLk=";
};
ldflags = [ "-X main.Version=${version}" ];
vendorHash = "sha256-sxeN7nbNTGfD8ZgNQiEQdYl11rhOvPP8UrnYXs9Ljhc=";
nativeCheckInputs = [
makeWrapper
git
];
checkFlags =
let
# Skip tests that does not works well inside an isolated environment
skippedTests = [
"TestInitialGitCheckout"
"TestHash"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
postInstall = ''
wrapProgram $out/bin/gitopper \
--suffix PATH : ${lib.makeBinPath [ git ]}
'';
meta = {
description = "Gitops for non-Kubernetes folks";
homepage = "https://github.com/miekg/gitopper/";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "gitopper";
};
}
@@ -0,0 +1,47 @@
{
stdenvNoCC,
fetchFromGitHub,
lib,
variant ? "Gruvbox-Dark-Brown",
}:
let
pname = "gruvbox-kvantum";
in
lib.checkListOfEnum "${pname}: variant"
[
"Gruvbox-Dark-Blue"
"Gruvbox-Dark-Brown"
"Gruvbox-Dark-Green"
"Gruvbox_Light_Blue"
"Gruvbox_Light_Brown"
"Gruvbox_Light_Green"
]
[ variant ]
stdenvNoCC.mkDerivation
{
inherit pname;
version = "1.1";
src = fetchFromGitHub {
owner = "sachnr";
repo = "gruvbox-kvantum-themes";
rev = "f47670be407c1f07c64890ad53884ee9977a7db1";
sha256 = "sha256-u2J4Zf9HuMjNCt3qVpgEffkytl/t277FzOvWL8Nm8os=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/Kvantum
cp -a "${variant}" $out/share/Kvantum
runHook postInstall
'';
meta = {
description = "Gruvbox themes for kvantum";
homepage = "https://github.com/sachnr/gruvbox-kvantum-themes";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ istudyatuni ];
};
}
+9 -8
View File
@@ -1,23 +1,24 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
{
lib,
buildGo122Module,
fetchFromGitHub,
installShellFiles,
}:
buildGoModule rec {
buildGo122Module rec {
pname = "hof";
version = "0.6.9-beta.1";
version = "0.6.9";
src = fetchFromGitHub {
owner = "hofstadter-io";
repo = "hof";
rev = "v${version}";
hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw=";
hash = "sha256-okY+CkPnlndy5H4M1+T1CY21+63+KPBinHoa5+8kQ2M=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI=";
vendorHash = "sha256-SmUEVWIyV6k5Lu5zeKGqpij3zUNRZQmIgtf8/Hf7UUs=";
subPackages = [ "./cmd/hof/main.go" ];
@@ -0,0 +1,42 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "infrastructure-agent";
version = "1.57.2";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = version;
hash = "sha256-74aBFGBrrEiqAVG3kVYLOz3P4VTCw4G3vV/iBucFPYs=";
};
vendorHash = "sha256-0WLL15CXRi/flp4EV3Qt0wO1VaUmAokzsChpiqjs+YQ=";
ldflags = [
"-s"
"-w"
"-X main.buildVersion=${version}"
"-X main.gitCommit=${src.rev}"
];
CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";
subPackages = [
"cmd/newrelic-infra"
"cmd/newrelic-infra-ctl"
"cmd/newrelic-infra-service"
];
meta = {
description = "New Relic Infrastructure Agent";
homepage = "https://github.com/newrelic/infrastructure-agent.git";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ davsanchez ];
mainProgram = "newrelic-infra";
};
}
+39
View File
@@ -0,0 +1,39 @@
{
lib,
fetchFromGitHub,
nix-update-script,
rustPlatform,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
pname = "jellyfin-rpc";
version = "1.3.0";
src = fetchFromGitHub {
owner = "Radiicall";
repo = "jellyfin-rpc";
rev = "refs/tags/${version}";
hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0=";
};
cargoHash = "sha256-KHbYM7aWgch+DWF46DpFCCt7JoKR0sasuFO3xPOytWA=";
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Displays the content you're currently watching on Discord";
homepage = "https://github.com/Radiicall/jellyfin-rpc";
changelog = "https://github.com/Radiicall/jellyfin-rpc/releases/tag/${version}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "jellyfin-rpc";
};
}
@@ -0,0 +1,38 @@
From 47f163f6bcd1d66bebc49d96abcf46853a0708fb Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 22 Oct 2024 07:48:34 +0800
Subject: [PATCH] fix build
---
src/helpers.c | 1 +
src/helpers.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/helpers.c b/src/helpers.c
index c7bc4de..00e6098 100644
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -9,6 +9,7 @@
#include <errno.h> // errno
#include <libgen.h> // dirname
+light_loglevel_t light_loglevel;
bool light_file_read_uint64(char const *filename, uint64_t *val)
{
diff --git a/src/helpers.h b/src/helpers.h
index f73714b..4a92753 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -21,7 +21,7 @@ typedef enum {
LIGHT_NOTE_LEVEL
} light_loglevel_t;
-light_loglevel_t light_loglevel;
+extern light_loglevel_t light_loglevel;
#define LIGHT_LOG(lvl, fp, fmt, args...)\
if(light_loglevel >= lvl)\
--
2.46.1
+47
View File
@@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitLab,
fetchpatch,
autoreconfHook,
coreutils,
}:
stdenv.mkDerivation {
version = "1.2.2";
pname = "light";
src = fetchFromGitLab {
owner = "dpeukert";
repo = "light";
rev = "2a54078cbe3814105ee4f565f451b1b5947fbde0";
hash = "sha256-OmHdVJvBcBjJiPs45JqOHxFoJYvKIEIpt9pFhBz74Kg=";
};
configureFlags = [ "--with-udev" ];
nativeBuildInputs = [ autoreconfHook ];
patches = [
./0001-define-light-loglevel-as-extern.patch
];
# ensure udev rules can find the commands used
postPatch = ''
substituteInPlace 90-backlight.rules \
--replace-fail '/bin/chgrp' '${coreutils}/bin/chgrp' \
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
'';
meta = {
description = "GNU/Linux application to control backlights";
homepage = "https://gitlab.com/dpeukert/light";
license = lib.licenses.gpl3Only;
mainProgram = "light";
maintainers = with lib.maintainers; [
puffnfresh
dtzWill
];
platforms = lib.platforms.linux;
};
}
+45
View File
@@ -0,0 +1,45 @@
{
lib,
python3Packages,
fetchFromGitHub,
qt5,
}:
python3Packages.buildPythonApplication rec {
pname = "meteo-qt";
version = "3.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "dglent";
repo = "meteo-qt";
rev = "refs/tags/v${version}";
hash = "sha256-J9R6UGfj3vaPfn0vmjeRMsHryc/1pxoKyIE9wteVYbY=";
};
nativeBuildInputs = [
qt5.qttools
qt5.wrapQtAppsHook
];
build-system = with python3Packages; [ sip ];
dependencies = with python3Packages; [
lxml
pyqt5
];
pythonImportsCheck = [ "meteo_qt" ];
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
meta = {
description = "System tray application for weather status information";
homepage = "https://github.com/dglent/meteo-qt";
changelog = "https://github.com/dglent/meteo-qt/blob/${src.rev}/CHANGELOG";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ linuxissuper ];
mainProgram = "meteo-qt";
platforms = lib.platforms.linux;
};
}
+1 -1
View File
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/grigio/obs-cmd";
changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
maintainers = with maintainers; [ ];
mainProgram = "obs-cmd";
};
}
+37 -20
View File
@@ -1,21 +1,23 @@
{ lib
, stdenv
, autoconf-archive
, autoreconfHook
, cppunit
, curl
, fetchFromGitHub
, installShellFiles
, libsigcxx
, libtool
, libtorrent
, ncurses
, openssl
, pkg-config
, xmlrpc_c
, zlib
, nixosTests
, gitUpdater
{
lib,
stdenv,
autoconf-archive,
autoreconfHook,
cppunit,
curl,
fetchFromGitHub,
fetchpatch,
installShellFiles,
libsigcxx,
libtool,
libtorrent,
ncurses,
openssl,
pkg-config,
xmlrpc_c,
zlib,
nixosTests,
gitUpdater,
}:
stdenv.mkDerivation rec {
@@ -29,7 +31,18 @@ stdenv.mkDerivation rec {
hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8=";
};
outputs = [ "out" "man" ];
patches = [
# fix: use fsync for osx builds
(fetchpatch {
url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch";
hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw=";
})
];
outputs = [
"out"
"man"
];
passthru = {
inherit libtorrent;
@@ -77,7 +90,11 @@ stdenv.mkDerivation rec {
homepage = "https://rakshasa.github.io/rtorrent/";
description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ];
maintainers = with lib.maintainers; [
ebzzry
codyopel
thiagokokada
];
platforms = lib.platforms.unix;
mainProgram = "rtorrent";
};
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "scd2html generates HTML from scdoc source files";
homepage = "https://git.sr.ht/~bitfehler/scd2html";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
mainProgram = "scd2html";
};
+54
View File
@@ -0,0 +1,54 @@
{
lib,
stdenv,
installShellFiles,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "sidekick";
version = "0.6.6";
src = fetchFromGitHub {
owner = "MightyMoud";
repo = "sidekick";
rev = "v${version}";
hash = "sha256-Y/dQRix/cxV3NGqTGtRP6Bcprj0jzzOpudgm9a1UMLc=";
};
nativeBuildInputs = [ installShellFiles ];
doInstallCheck = true;
doCheck = true;
vendorHash = "sha256-35MThhVqCcIFH2oQNw6n73JqNVr2T6mXaIJMK9LiXq8=";
ldflags = [
"-s"
"-w"
"-X github.com/mightymoud/sidekick/cmd.version=${version}"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd sidekick \
--bash <($out/bin/sidekick completion bash) \
--fish <($out/bin/sidekick completion fish) \
--zsh <($out/bin/sidekick completion zsh)
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
meta = {
description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS";
mainProgram = "sidekick";
homepage = "https://github.com/MightyMoud/sidekick";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ nipeharefa ];
};
}
+1 -1
View File
@@ -50,7 +50,7 @@ buildGoModule rec {
description = "Your little expandable text snippet helper CLI";
homepage = "https://snippetexpander.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ianmjones ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "snippetexpander";
};
+1 -1
View File
@@ -61,7 +61,7 @@ buildGoModule rec {
description = "Your little expandable text snippet helper daemon";
homepage = "https://snippetexpander.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ianmjones ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "snippetexpanderd";
};
@@ -65,7 +65,7 @@ buildGoModule rec {
description = "Your little expandable text snippet helper GUI";
homepage = "https://snippetexpander.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ianmjones ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "snippetexpandergui";
};
+1 -1
View File
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
description = "Your little expandable text snippet helper auto expander daemon";
homepage = "https://snippetexpander.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ianmjones ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "snippetexpanderx";
};
+5 -11
View File
@@ -2,7 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
installShellFiles,
stdenv,
darwin,
rust-jemalloc-sys,
@@ -11,21 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sqruff";
version = "0.17.0";
version = "0.20.2";
src = fetchFromGitHub {
owner = "quarylabs";
repo = "sqruff";
rev = "refs/tags/v${version}";
hash = "sha256-uUtbVf4U59jne5uORXpyzpqhFQoviKi2O9KQ5s1CfhU=";
hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM=";
};
cargoHash = "sha256-kIBjPh+rL4vzIAqGNYMpw39A0vADbHxi/PkhoG+QL6c=";
# Requires nightly features (feature(let_chains) and feature(trait_upcasting))
RUSTC_BOOTSTRAP = true;
nativeBuildInputs = [ installShellFiles ];
cargoHash = "sha256-WqkHZcA4FBm8zubAnDrJGH+fgLVIxsNNm3B+mdj5Sxw=";
buildInputs = [
rust-jemalloc-sys
@@ -35,8 +29,8 @@ rustPlatform.buildRustPackage rec {
postPatch = ''
substituteInPlace crates/cli/tests/ui.rs \
--replace-fail \
'config.program.program = format!("../../target/{profile}/sqruff").into();' \
'config.program.program = "../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/sqruff".into();'
'sqruff_path.push(format!("../../target/{}/sqruff", profile));' \
'sqruff_path.push(format!("../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/{}/sqruff", profile));'
'';
nativeCheckInputs = [ versionCheckHook ];
@@ -0,0 +1,87 @@
{
lib,
stdenv,
fetchFromGitHub,
gperf,
libcap,
meson,
ninja,
nix-update-script,
openssl,
pkg-config,
pkgsCross,
sphinx,
systemd,
systemdLibs,
opensslSupport ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "systemd-netlogd";
version = "1.4.2";
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd-netlogd";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-FwBwhsnVathlRQjKyrsPpZZlCb2rIpVuHGq9mG3mNsw=";
};
# Fixup a few installation paths
postPatch = ''
substituteInPlace meson.build \
--replace-fail "get_option('prefix')" "get_option('bindir')"
substituteInPlace doc/meson.build \
--replace-fail "'/usr/share/man/man8'" "get_option('mandir') / 'man8'"
substituteInPlace units/meson.build \
--replace-fail "get_option('prefix') / 'system'" "get_option('libdir') / 'systemd/system'"
substituteInPlace units/systemd-netlogd.service.in \
--replace-fail '@PKGPREFIX@/systemd-netlogd' '${placeholder "out"}/bin/systemd-netlogd'
'';
outputs = [
"out"
"man"
];
strictDeps = true;
nativeBuildInputs = [
gperf
meson
ninja
pkg-config
sphinx
];
buildInputs = [
libcap
systemdLibs
] ++ lib.optional opensslSupport openssl;
mesonFlags = [
"--sysconfdir=${placeholder "out"}/etc/systemd"
(lib.mesonBool "openssl" opensslSupport)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru = {
# Make sure x86_64-linux -> aarch64-linux cross compilation works
tests = lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") {
aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd;
};
updateScript = nix-update-script { };
};
meta = {
description = "Forwards messages from the journal to other hosts over the network";
homepage = "https://github.com/systemd/systemd-netlogd";
changelog = "https://github.com/systemd/systemd-netlogd/releases/tag/${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ getchoo ];
inherit (systemd.meta) platforms;
mainProgram = "systemd-netlogd";
};
})
@@ -16,6 +16,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8=";
postPatch = ''
substituteInPlace tests/utils.rs --replace-fail \
'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/debug"
'';
meta = with lib; {
description = "Log file highlighter";
homepage = "https://github.com/bensadeh/tailspin";
+96 -93
View File
@@ -49,26 +49,26 @@ dependencies = [
[[package]]
name = "anstyle"
version = "1.0.8"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
version = "0.2.5"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.1"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -83,9 +83,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.91"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]]
name = "arrayref"
@@ -183,14 +183,14 @@ dependencies = [
[[package]]
name = "async_http_range_reader"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1a0e0571c5d724d17fbe0b608d31a91e94938722c141877d3a2982216b084c2"
checksum = "4015e7130cf870da1c64a9c7ba474f4b3772a530edbeb05f8358bc9a02f8e505"
dependencies = [
"bisection",
"futures",
"http-content-range",
"itertools 0.12.1",
"itertools 0.13.0",
"memmap2 0.9.5",
"reqwest",
"reqwest-middleware",
@@ -229,12 +229,13 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "axoasset"
version = "1.0.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45e7b7ac1c1cd4fdcaa2f9e704defa9defd996039083d85e17efa5e8eefb3bd2"
checksum = "90f16d4ba2365a6f9b4394b369597b9bc00a1651db758edbe6d63a34879b9024"
dependencies = [
"camino",
"image",
"lazy_static",
"miette",
"mime",
"reqwest",
@@ -269,9 +270,9 @@ dependencies = [
[[package]]
name = "axoupdater"
version = "0.7.3"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe17874ee40fb66fe1d2cb7871b14de4d298fbf77ea29a6cedb8027365e1a33"
checksum = "7fb8d8889305a413a040f281197bb2f8982a1d25c9696707cab350e3cc780ba5"
dependencies = [
"axoasset",
"axoprocess",
@@ -284,6 +285,7 @@ dependencies = [
"tempfile",
"thiserror",
"tokio",
"url",
]
[[package]]
@@ -420,9 +422,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
version = "1.7.2"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "bzip2"
@@ -465,9 +467,9 @@ dependencies = [
[[package]]
name = "cargo-util"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d"
checksum = "b6dd67a24439ca5260a08128b6cbf4b0f4453497a2f60508163ab9d5b534b122"
dependencies = [
"anyhow",
"core-foundation",
@@ -483,7 +485,7 @@ dependencies = [
"tempfile",
"tracing",
"walkdir",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -494,9 +496,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
version = "1.1.30"
version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"jobserver",
"libc",
@@ -577,9 +579,9 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.5.33"
version = "4.5.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb"
checksum = "86bc73de94bc81e52f3bebec71bc4463e9748f7a59166663e32044669577b0e2"
dependencies = [
"clap",
]
@@ -662,9 +664,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "colorchoice"
version = "1.0.2"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "colored"
@@ -948,6 +950,12 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "dotenvy"
version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
[[package]]
name = "dunce"
version = "1.0.5"
@@ -974,9 +982,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
version = "0.8.34"
version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
@@ -1056,9 +1064,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
version = "0.3.5"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb"
dependencies = [
"simd-adler32",
]
@@ -1207,9 +1215,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
version = "2.3.0"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
dependencies = [
"fastrand",
"futures-core",
@@ -1470,9 +1478,9 @@ dependencies = [
[[package]]
name = "http-content-range"
version = "0.1.4"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b"
checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0"
[[package]]
name = "httparse"
@@ -1528,9 +1536,9 @@ dependencies = [
[[package]]
name = "hyper-util"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [
"bytes",
"futures-channel",
@@ -1573,9 +1581,9 @@ dependencies = [
[[package]]
name = "image"
version = "0.25.2"
version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder-lite",
@@ -1620,9 +1628,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "insta"
version = "1.41.0"
version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
dependencies = [
"console",
"lazy_static",
@@ -1684,15 +1692,6 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.13.0"
@@ -1710,9 +1709,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "jiff"
version = "0.1.13"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb"
checksum = "b9d9d414fc817d3e3d62b2598616733f76c4cc74fbac96069674739b881295c8"
dependencies = [
"jiff-tzdb-platform",
"serde",
@@ -2320,18 +2319,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
[[package]]
name = "pin-project"
version = "1.1.6"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.1.6"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
@@ -2340,9 +2339,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -2477,23 +2476,22 @@ dependencies = [
[[package]]
name = "procfs"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
dependencies = [
"bitflags 2.6.0",
"flate2",
"hex",
"lazy_static",
"procfs-core",
"rustix",
]
[[package]]
name = "procfs-core"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
dependencies = [
"bitflags 2.6.0",
"hex",
@@ -2569,10 +2567,11 @@ dependencies = [
[[package]]
name = "quinn-udp"
version = "0.5.5"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780"
dependencies = [
"cfg_aliases",
"libc",
"once_cell",
"socket2",
@@ -2764,9 +2763,9 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.12.8"
version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
dependencies = [
"async-compression",
"base64 0.22.1",
@@ -3016,9 +3015,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.15"
version = "0.23.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
dependencies = [
"once_cell",
"ring",
@@ -3206,9 +3205,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
version = "1.0.213"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
@@ -3226,9 +3225,9 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.213"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
@@ -3490,9 +3489,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.85"
version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -3645,18 +3644,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.65"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.65"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
dependencies = [
"proc-macro2",
"quote",
@@ -4023,12 +4022,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
[[package]]
name = "unicase"
version = "2.7.0"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
dependencies = [
"version_check",
]
checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
[[package]]
name = "unicode-bidi"
@@ -4176,7 +4172,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
[[package]]
name = "uv"
version = "0.4.29"
version = "0.4.30"
dependencies = [
"anstream",
"anyhow",
@@ -4188,6 +4184,7 @@ dependencies = [
"clap",
"console",
"ctrlc",
"dotenvy",
"etcetera",
"filetime",
"flate2",
@@ -4208,7 +4205,6 @@ dependencies = [
"regex",
"reqwest",
"rustc-hash",
"same-file",
"serde",
"serde_json",
"similar",
@@ -4257,6 +4253,7 @@ dependencies = [
"uv-shell",
"uv-static",
"uv-tool",
"uv-trampoline-builder",
"uv-types",
"uv-version",
"uv-virtualenv",
@@ -4945,6 +4942,7 @@ name = "uv-performance-flate2-backend"
version = "0.1.0"
dependencies = [
"flate2",
"libz-ng-sys",
]
[[package]]
@@ -4983,15 +4981,17 @@ dependencies = [
"rustc-hash",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
"tokio-util",
"tracing",
"url",
"uv-cache",
"uv-client",
"uv-configuration",
"uv-distribution-filename",
"uv-distribution-types",
"uv-extract",
"uv-fs",
"uv-metadata",
"uv-pypi-types",
@@ -5072,6 +5072,7 @@ dependencies = [
"uv-pypi-types",
"uv-state",
"uv-static",
"uv-trampoline-builder",
"uv-warnings",
"which",
"windows-registry 0.3.0",
@@ -5270,6 +5271,9 @@ dependencies = [
[[package]]
name = "uv-static"
version = "0.0.1"
dependencies = [
"uv-macros",
]
[[package]]
name = "uv-tool"
@@ -5333,7 +5337,7 @@ dependencies = [
[[package]]
name = "uv-version"
version = "0.4.29"
version = "0.4.30"
[[package]]
name = "uv-virtualenv"
@@ -5366,7 +5370,6 @@ version = "0.0.1"
dependencies = [
"anyhow",
"assert_fs",
"either",
"fs-err",
"glob",
"insta",
@@ -5521,9 +5524,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "wasm-streams"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
dependencies = [
"futures-util",
"js-sys",
@@ -5574,9 +5577,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "which"
version = "6.0.3"
version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
dependencies = [
"either",
"home",
+2 -9
View File
@@ -1,28 +1,25 @@
{
lib,
cmake,
darwin,
fetchFromGitHub,
installShellFiles,
libiconv,
pkg-config,
python3Packages,
rustPlatform,
stdenv,
versionCheckHook,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "uv";
version = "0.4.29";
version = "0.4.30";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = "refs/tags/${version}";
hash = "sha256-FJJnb4m9yPf1bBvlAyAgQKgAzt4O0tbokYkz4iY6kbg=";
hash = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU=";
};
cargoDeps = rustPlatform.importCargoLock {
@@ -43,10 +40,6 @@ python3Packages.buildPythonApplication rec {
rustPlatform.maturinBuildHook
];
buildInputs = [
libiconv
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
dontUseCmakeConfigure = true;
cargoBuildFlags = [
+7 -16
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, libSM
, libXdmcp
@@ -19,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "obconf-qt";
version = "0.16.4";
version = "0.16.5";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
repo = "obconf-qt";
rev = version;
hash = "sha256-uF90v56BthEts/Jy+a6kH2b1QFHCtft4ZLxyi/K/Vnc=";
hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo=";
};
nativeBuildInputs = [
@@ -46,22 +45,14 @@ stdenv.mkDerivation rec {
qtwayland
];
patches = [
(fetchpatch {
name = "obconf-qt.port-to-qt6";
url = "https://patch-diff.githubusercontent.com/raw/lxqt/obconf-qt/pull/230.patch";
hash = "sha256-XLt8+/4oMXeli07qTAGc73U9RD1fGYqxTX0QdhuXpII=";
})
];
passthru.updateScript = gitUpdater { };
meta = with lib; {
meta = {
homepage = "https://github.com/lxqt/obconf-qt";
description = "Qt port of obconf, the Openbox configuration tool";
mainProgram = "obconf-qt";
license = licenses.gpl2Plus;
platforms = with platforms; unix;
maintainers = teams.lxqt.members;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = lib.teams.lxqt.members;
};
}
+2 -2
View File
@@ -43,7 +43,7 @@
buildPythonPackage rec {
pname = "django";
version = "5.1.2";
version = "5.1.3";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
hash = "sha256-HQt7et2PBG5rPCFCl64CIr+jTpty0a5IxJ0rKP6QCBM=";
hash = "sha256-TqOVe+QkwNx/SpI/6X/AQaqLHk3LDSupoRl3RKL6kac=";
};
patches =
@@ -10,6 +10,7 @@
openai,
pip,
pluggy,
puremagic,
pydantic,
python-ulid,
pyyaml,
@@ -21,7 +22,7 @@
let
llm = buildPythonPackage rec {
pname = "llm";
version = "0.16";
version = "0.17.1";
pyproject = true;
build-system = [ setuptools ];
@@ -32,7 +33,7 @@ let
owner = "simonw";
repo = "llm";
rev = "refs/tags/${version}";
hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE=";
hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY=";
};
patches = [ ./001-disable-install-uninstall-commands.patch ];
@@ -43,6 +44,7 @@ let
openai
pip
pluggy
puremagic
pydantic
python-ulid
pyyaml
@@ -1,36 +1,40 @@
{
lib
, buildPythonPackage
, fetchPypi
, setuptools
, zlib
, altgraph
, packaging
, pyinstaller-hooks-contrib
, testers
, pyinstaller
, glibc
, binutils
, macholib
, installShellFiles
, stdenv
lib,
stdenv,
buildPythonPackage,
fetchPypi,
# build-system
setuptools,
# native dependencies
zlib,
# dependencies
altgraph,
macholib,
packaging,
pyinstaller-hooks-contrib,
# tests
binutils,
glibc,
pyinstaller,
testers,
}:
buildPythonPackage rec {
pname = "pyinstaller";
version = "6.10.0";
version = "6.11.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-FDhA+AVv97kQv48W9s2SzBCmwmgLt20KJdVY1UPSEnA=";
hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8=";
};
build-system = [ setuptools ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ zlib.dev ];
dependencies = [
@@ -41,13 +45,15 @@ buildPythonPackage rec {
];
makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
"--prefix" "PATH" ":" (lib.makeBinPath [ glibc binutils ])
"--prefix"
"PATH"
":"
(lib.makeBinPath [
glibc
binutils
])
];
postInstall = ''
installManPage doc/pyinstaller.1 doc/pyi-makespec.1
'';
pythonImportsCheck = [ "PyInstaller" ];
passthru.tests.version = testers.testVersion {
@@ -58,14 +58,14 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.46.1";
version = "4.46.2";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "transformers";
rev = "refs/tags/v${version}";
hash = "sha256-lVpzOjBb92EZpNLSPBSWrpkENgdovCDSoMp6R13nzsM=";
hash = "sha256-5bYjgrW2ITJ/bc8BP/tWjzwLrLQHgvKSVyUCNsRniFM=";
};
build-system = [ setuptools ];
@@ -1,4 +1,8 @@
{ lib, rustPlatform, fetchFromGitHub }:
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-sweep";
@@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
# Requires a rustup toolchain to be installed.
"--skip check_toolchain_listing_on_multiple_projects"
# Does not work with a `--target` build in the environment
"--skip empty_project_output"
];
meta = with lib; {
@@ -23,6 +29,9 @@ rustPlatform.buildRustPackage rec {
mainProgram = "cargo-sweep";
homepage = "https://github.com/holmgr/cargo-sweep";
license = licenses.mit;
maintainers = with maintainers; [ xrelkd matthiasbeyer ];
maintainers = with maintainers; [
xrelkd
matthiasbeyer
];
};
}
+1 -1
View File
@@ -69,7 +69,7 @@ buildGoModule rec {
description = "Build applications using Go + HTML + CSS + JS";
homepage = "https://wails.io";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ianmjones ];
maintainers = with lib.maintainers; [ ];
mainProgram = "wails";
platforms = lib.platforms.unix;
};
@@ -0,0 +1,15 @@
diff --git a/configure.ac b/configure.ac
index ef07d70..2da26aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,9 @@ if test "$have_fuse_opt_parse" = no; then
fi
AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
-AC_CHECK_FUNCS([setxattr fdatasync getline fgetln])
+AC_CHECK_FUNCS([setxattr getline fgetln])
AC_CONFIG_FILES([Makefile
src/Makefile
compat/Makefile])
+16 -3
View File
@@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }:
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
autoreconfHook,
fuse,
}:
stdenv.mkDerivation rec {
pname = "afuse";
@@ -11,12 +18,18 @@ stdenv.mkDerivation rec {
sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [ fuse ];
patches = [ ./001-darwin-fdatasync.patch ];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Fix the build on macOS with macFUSE installed
substituteInPlace configure.ac --replace \
substituteInPlace configure.ac --replace-fail \
'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \
""
'';
-42
View File
@@ -1,42 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, coreutils }:
stdenv.mkDerivation rec {
version = "1.2.2";
pname = "light";
src = fetchFromGitHub {
owner = "haikarainen";
repo = "light";
rev = "v${version}";
sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s";
};
patches = [
# Pull upstream fix for -fno-common toolchains:
# https://github.com/haikarainen/light/pull/135
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/haikarainen/light/commit/eae912ca7ff3356805e47739114861d2b6ae7ec0.patch";
sha256 = "15jp8hm5scl0myiy1jmvd6m52lhx5jscvi3rgb5siwakmnkgzx9j";
})
];
configureFlags = [ "--with-udev" ];
nativeBuildInputs = [ autoreconfHook ];
# ensure udev rules can find the commands used
postPatch = ''
substituteInPlace 90-backlight.rules \
--replace '/bin/chgrp' '${coreutils}/bin/chgrp' \
--replace '/bin/chmod' '${coreutils}/bin/chmod'
'';
meta = {
description = "GNU/Linux application to control backlights";
homepage = "https://haikarainen.github.io/light/";
license = lib.licenses.gpl3;
mainProgram = "light";
maintainers = with lib.maintainers; [ puffnfresh dtzWill ];
platforms = lib.platforms.linux;
};
}
-40
View File
@@ -1,40 +0,0 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.29.3";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
hash = "sha256-cxMims1b4zOmpRZSn9rovUCnUT66omgNYjDJWuIDnSk=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''
rm -r $out/tests/fixtures
'';
};
cargoHash = "sha256-/7A1XW6EbOQpXeAlsOe1YoY6MdBQ3kC98TTBMs3Zfy8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];
doCheck = false;
meta = with lib; {
description = "Tool to conveniently learn about the disk usage of directories";
homepage = "https://github.com/Byron/dua-cli";
changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ figsoda killercup ];
mainProgram = "dua";
};
}
+1 -1
View File
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.snippetpixie.com";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
platforms = platforms.linux;
mainProgram = "com.github.bytepixie.snippetpixie";
};
-8
View File
@@ -446,8 +446,6 @@ with pkgs;
ciel = callPackage ../tools/package-management/ciel { };
circt = callPackage ../development/compilers/circt { };
clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {
stdenv = clangStdenv;
};
@@ -4700,8 +4698,6 @@ with pkgs;
dtrx = callPackage ../tools/compression/dtrx { };
dua = callPackage ../tools/misc/dua { };
duf = callPackage ../tools/misc/duf { };
dum = callPackage ../development/tools/dum { };
@@ -24998,8 +24994,6 @@ with pkgs;
tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
tailspin = callPackage ../tools/misc/tailspin { };
trafficserver = callPackage ../servers/http/trafficserver { };
inherit (callPackages ../servers/http/tomcat { })
@@ -25368,8 +25362,6 @@ with pkgs;
then util-linuxMinimal
else null;
light = callPackage ../os-specific/linux/light { };
lightum = callPackage ../os-specific/linux/lightum { };
ebtables = callPackage ../os-specific/linux/ebtables { };