Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-08-07 00:01:58 +00:00 committed by GitHub
commit bb21178e5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 363 additions and 1220 deletions

View File

@ -3946,6 +3946,12 @@
fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000";
}];
};
declan = {
name = "Declan Rixon";
email = "declan.fraser.rixon@gmail.com";
github = "DeclanRixon";
githubId = 57464835;
};
deejayem = {
email = "nixpkgs.bu5hq@simplelogin.com";
github = "deejayem";

View File

@ -71,7 +71,7 @@ in
];
default = "cpu";
description = mdDoc ''
Id of a speaker in a multi-speaker model.
Determines the platform faster-whisper is run on. CPU works everywhere, CUDA requires a compatible NVIDIA GPU.
'';
};

View File

@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ivar ];
platforms = platforms.linux;
mainProgram = "tuigreet";
};
}

View File

@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
version = "6.23.0";
version = "6.24.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-XX511kUtL4lpSsp9JTuHrGJd4M6ChA6PwY5enn2zf8I=";
hash = "sha256-SG6st8RRN2hGFQa1XB93fbklTNta5uJXGSeY+F7CSPY=";
};
# https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1

View File

@ -8,22 +8,29 @@
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "seatd";
version = "0.7.0";
version = "0.8.0";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = "seatd";
rev = version;
sha256 = "sha256-m8xoL90GI822FTgCXuVr3EejLAMUStkPKVoV7w8ayIE=";
rev = finalAttrs.version;
hash = "sha256-YaR4VuY+wrzbnhER4bkwdm0rTY1OVMtixdDEhu7Lnws=";
};
outputs = [ "bin" "out" "dev" "man" ];
depsBuildBuild = [ pkg-config ];
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
nativeBuildInputs = [
meson
ninja
pkg-config
scdoc
];
buildInputs = lib.optionals systemdSupport [ systemd ];
@ -33,12 +40,12 @@ stdenv.mkDerivation rec {
"-Dserver=enabled"
];
meta = with lib; {
meta = {
description = "A universal seat management library";
changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}";
homepage = "https://sr.ht/~kennylevinsen/seatd/";
license = licenses.mit;
platforms = with platforms; freebsd ++ linux ++ netbsd;
maintainers = with maintainers; [ emantor ];
changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${finalAttrs.version}";
homepage = "https://sr.ht/~kennylevinsen/seatd/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ emantor ];
platforms = with lib.platforms; freebsd ++ linux ++ netbsd;
};
}
})

View File

@ -18,6 +18,7 @@
, libxkbcommon
, cavaSupport ? true, alsa-lib, fftw, iniparser, ncurses, pipewire, portaudio, SDL2
, evdevSupport ? true, libevdev
, hyprlandSupport ? false, hyprland
, inputSupport ? true, libinput
, jackSupport ? true, libjack2
, mpdSupport ? true, libmpdclient
@ -65,6 +66,10 @@ stdenv.mkDerivation rec {
)
'';
# Patch for workspaces support in wlr/workspaces
# See https://wiki.hyprland.org/Useful-Utilities/Status-Bars/#waybar
patches = lib.optional hyprlandSupport [ ./hyprland.diff ];
nativeBuildInputs = [
meson ninja pkg-config scdoc wrapGAppsHook
] ++ lib.optional withMediaPlayer gobject-introspection;
@ -88,6 +93,7 @@ stdenv.mkDerivation rec {
++ optional cavaSupport portaudio
++ optional cavaSupport SDL2
++ optional evdevSupport libevdev
++ optional hyprlandSupport hyprland
++ optional inputSupport libinput
++ optional jackSupport libjack2
++ optional mpdSupport libmpdclient
@ -126,7 +132,7 @@ stdenv.mkDerivation rec {
"-Dsystemd=disabled"
"-Dgtk-layer-shell=enabled"
"-Dman-pages=enabled"
];
] ++ lib.optional hyprlandSupport "-Dexperimental=true";
preFixup = lib.optionalString withMediaPlayer ''
cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
@ -139,7 +145,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/alexays/waybar/releases/tag/${version}";
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ];
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz jtbx ];
platforms = platforms.unix;
homepage = "https://github.com/alexays/waybar";
mainProgram = "waybar";

View File

@ -0,0 +1,12 @@
--- a/src/modules/wlr/workspace_manager.cpp
+++ b/src/modules/wlr/workspace_manager.cpp
@@ -523,7 +523,8 @@
if (action.empty())
return true;
else if (action == "activate") {
- zext_workspace_handle_v1_activate(workspace_handle_);
+ const std::string command = "hyprctl dispatch workspace " + name_;
+ system(command.c_str());
} else if (action == "close") {
zext_workspace_handle_v1_remove(workspace_handle_);
} else {

View File

@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
version = "6.19.2";
version = "6.20.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
hash = "sha256-3nEfg2hmOMjevo5VhjelIeV2xRwkIOVhLNxBmPzdWog=";
hash = "sha256-RliH4cr96lsigtoJiq5ymkIY8rbXG4xYmhWDAwZpSY0=";
};
postPatch = ''

View File

@ -41,9 +41,9 @@
version = "2023-05-19";
};
};
sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
version = "115.0.5790.110";
sha256 = "1h3j24ihn76qkvckzg703pm1jsh6nbkc48n2zx06kia8wz96567z";
sha256bin64 = "04jklk2zwkyy8i70v9nk7nw35w2g9pyxdw9w3sn9mddgbjjph5z9";
version = "115.0.5790.170";
};
ungoogled-chromium = {
deps = {

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
version = "2.4.0";
version = "2.4.1";
src = fetchFromGitHub {
owner = "Xithrius";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-giD26vFR+KRcPwNlZD23Km9AYS5iYUlBfhIiMpScIiE=";
hash = "sha256-+dKS9lp5M8vh0V4VGyWAozozdsyCPpCZR4CQK5s51Ds=";
};
cargoHash = "sha256-wUw11toTHtm/opa8TBIcbPK/pjOZZCUieeIXCdn4oto=";
cargoHash = "sha256-CzrOsLUTfZ2uEIj/AHFmdfZniwlQ6fIkL2pbBHF8YkU=";
nativeBuildInputs = [
pkg-config

View File

@ -0,0 +1,45 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, glib
, gst_all_1
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
pname = "timelens";
version = "0.1.1";
src = fetchFromGitHub {
owner = "timelens";
repo = "timelens";
rev = version;
hash = "sha256-cGFM1QOuavGwGBccUEttSTp+aD+d31Cqul+AQYvbyhY=";
};
cargoHash = "sha256-rVE2foebSEk3zJQTAkmhoIOFyMArGnt9tLlOS7RjQYM=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook
];
buildInputs = [
glib
gst_all_1.gstreamer
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-ugly
];
meta = {
description = "A open source project for creating visual timelines";
homepage = "https://timelens.blinry.org";
changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ janik ];
};
}

View File

@ -274,6 +274,7 @@ rec {
'';
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester periklis maxeaubrey ];
mainProgram = "docker";
};
});

View File

@ -1,40 +1,46 @@
{ stdenv
, lib
{
cmake
, fetchFromGitHub
, cmake
, pkg-config
, hidapi
, lib
, libftdi1
, libusb1
, pkg-config
, stdenv
, udev
, hidapi
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "openfpgaloader";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${version}";
sha256 = "sha256-MPIFD7/jUEotY/EhuzNhaz8C3LVMxUr++fhtCpbbz0o=";
rev = "v${finalAttrs.version}";
hash = "sha256-OiyuhDrK4w13lRmgfmMlZ+1gvRZCJxsOF6MzLy3CFpg=";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
hidapi
libftdi1
libusb1
udev
hidapi
zlib
];
meta = with lib; {
meta = {
broken = stdenv.isDarwin; # error: Package systemd-253.6 is not available on the requested Darwin platform.
description = "Universal utility for programming FPGAs";
homepage = "https://github.com/trabucayre/openFPGALoader";
license = licenses.agpl3Only;
maintainers = with maintainers; [ danderson ];
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ danderson ];
platforms = lib.platforms.linux;
};
}
})

View File

@ -1,5 +1,5 @@
{ lib
, mkDerivation
, stdenv
, wrapQtAppsHook
, fetchFromGitHub
, cmake
@ -10,27 +10,31 @@
, libpng
, boost
, guile
, stdenv
, qtbase
, darwin
}:
mkDerivation {
pname = "libfive-unstable";
version = "2022-05-19";
stdenv.mkDerivation {
pname = "libfive";
version = "unstable-2023-06-07";
src = fetchFromGitHub {
owner = "libfive";
repo = "libfive";
rev = "d83cc22709ff1f7c478be07ff2419e30e024834e";
sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0=";
rev = "c85ffe1ba1570c2551434c5bad731884aaf80598";
hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc=";
};
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
buildInputs = [ eigen zlib libpng boost guile ];
buildInputs = [ eigen zlib libpng boost guile qtbase ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ];
preConfigure = ''
substituteInPlace studio/src/guile/interpreter.cpp \
--replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \
"qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/${guile.siteCcacheDir}\");"
--replace '"libfive/bind/guile"' \
'"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"' \
--replace '(app_resource_dir + ":" + finder_build_dir).toLocal8Bit()' \
'"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"'
substituteInPlace libfive/bind/guile/CMakeLists.txt \
--replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \
@ -43,18 +47,20 @@ mkDerivation {
cmakeFlags = [
"-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}"
] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [
# warning: 'aligned_alloc' is only available on macOS 10.15 or newer
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
];
postInstall = if stdenv.isDarwin then ''
postInstall = lib.optionalString stdenv.isDarwin ''
# No rules to install the mac app, so do it manually.
mkdir -p $out/Applications
cp -r studio/Studio.app $out/Applications/Studio.app
install_name_tool \
-change libfive.dylib $out/lib/libfive.dylib \
-change libfive-guile.dylib $out/lib/libfive-guile.dylib \
$out/Applications/Studio.app/Contents/MacOS/Studio
'' else ''
install_name_tool -add_rpath $out/lib $out/Applications/Studio.app/Contents/MacOS/Studio
makeWrapper $out/Applications/Studio.app/Contents/MacOS/Studio $out/bin/Studio
'' + ''
# Link "Studio" binary to "libfive-studio" to be more obvious:
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
'';
@ -64,6 +70,6 @@ mkDerivation {
homepage = "https://libfive.com/";
maintainers = with maintainers; [ hodapp kovirobi ];
license = with licenses; [ mpl20 gpl2Plus ];
platforms = with platforms; linux ++ darwin;
platforms = with platforms; all;
};
}

View File

@ -1,6 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod
, enable-tools ? true
, enablePython ? false, python3, ncurses }:
{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config
, enable-tools ? true }:
stdenv.mkDerivation rec {
pname = "libgpiod";
@ -11,7 +10,6 @@ stdenv.mkDerivation rec {
hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk=";
};
buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
nativeBuildInputs = [
autoconf-archive
pkg-config
@ -21,8 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-tools=${if enable-tools then "yes" else "no"}"
"--enable-bindings-cxx"
"--prefix=${placeholder "out"}"
] ++ lib.optional enablePython "--enable-bindings-python";
];
meta = with lib; {
description = "C library and tools for interacting with the linux GPIO character device";
@ -32,7 +29,10 @@ stdenv.mkDerivation rec {
data structures behind a straightforward API.
'';
homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
license = licenses.lgpl2;
license = with licenses; [
lgpl21Plus # libgpiod
lgpl3Plus # C++ bindings
] ++ lib.optional enable-tools gpl2Plus;
maintainers = [ maintainers.expipiplus1 ];
platforms = platforms.linux;
};

View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, meson
, ninja
, freetype
, harfbuzz
, fribidi
}:
stdenv.mkDerivation rec {
pname = "libraqm";
version = "0.10.1";
src = fetchFromGitHub {
owner = "HOST-Oman";
repo = "libraqm";
rev = "v${version}";
sha256 = "sha256-H9W+7Mob3o5ctxfp5UhIxatSdXqqvkpyEibJx9TO7a8=";
};
buildInputs = [ freetype harfbuzz fribidi ];
nativeBuildInputs = [ pkg-config meson ninja ];
doCheck = true;
meta = with lib; {
description = "A library for complex text layout";
homepage = "https://github.com/HOST-Oman/libraqm";
license = licenses.mit;
maintainers = with maintainers; [ sifmelcara ];
platforms = platforms.all;
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.13.8";
version = "0.13.9";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
hash = "sha256-IC668e9XRi4rxwiwwdu4mkrQQy/hkM3OGodCDso/Uo4=";
hash = "sha256-iAfP8idJXhAsCnhlGUyMHK723kEER5bCYJNLsvaCrTA=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, libgpiod
}:
buildPythonPackage {
inherit (libgpiod) pname version src;
format = "setuptools";
buildInputs = [ libgpiod ];
preConfigure = ''
cd bindings/python
'';
# Requires libgpiod built with --enable-tests
doCheck = false;
pythonImportsCheck = [ "gpiod" ];
meta = with lib; {
description = "Python bindings for libgpiod";
homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ lopsided98 ];
};
}

View File

@ -1,25 +1,38 @@
{ lib, castxml, fetchFromGitHub, buildPythonPackage,
llvmPackages }:
{ lib
, castxml
, fetchFromGitHub
, buildPythonPackage
, llvmPackages
, pythonOlder
}:
buildPythonPackage rec {
pname = "pygccxml";
version = "2.2.1";
version = "2.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "gccxml";
repo = "pygccxml";
rev = "v${version}";
sha256 = "1msqpg3dqn7wjlf91ddljxzz01a3b1p2sy91n36lrsy87lz499gh";
owner = "gccxml";
repo = "pygccxml";
rev = "refs/tags/v${version}";
hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k=";
};
buildInputs = [ castxml llvmPackages.libcxxStdenv];
buildInputs = [
castxml
llvmPackages.libcxxStdenv
];
# running the suite is hard, needs to generate xml_generator.cfg
# but the format doesn't accept -isystem directives
doCheck = false;
meta = with lib; {
homepage = "https://github.com/gccxml/pygccxml";
description = "Python package for easy C++ declarations navigation";
homepage = "https://github.com/gccxml/pygccxml";
changelog = "https://github.com/CastXML/pygccxml/blob/v${version}/CHANGELOG.md";
license = licenses.boost;
maintainers = with maintainers; [ teto ];
};

View File

@ -25,7 +25,7 @@
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
, autoSignDarwinBinariesHook, fetchpatch
}@args:
@ -711,6 +711,16 @@ in
buildFlags = [ "--disable-lto" ];
});
sass-embedded = attrs: {
# Patch the Rakefile to use our dart-sass and not try to fetch anything.
dontBuild = false;
postPatch = ''
substituteInPlace ext/sass/Rakefile \
--replace \'dart-sass/sass\' \'${dart-sass}/bin/sass\' \
--replace ' => %w[dart-sass]' ""
'';
};
scrypt = attrs: lib.optionalAttrs stdenv.isDarwin {
dontBuild = false;
postPatch = ''

View File

@ -17,13 +17,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.31.0";
version = "1.31.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
hash = "sha256-hnQvpxWIPMlcaIDPEKPHSXUTqbFnfDiTXybRBbFvqDA=";
hash = "sha256-EqnVlYZPddT6jE8G3uXCrj5H0XZJfUrUQkDPoRf8MOc=";
};
outputs = [ "out" "man" ];

View File

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, ninja
, python3
}:
stdenv.mkDerivation (finalAttrs: {
pname = "glslls";
version = "0.4.1";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "glsl-language-server";
rev = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-UgQXxme0uySKYhhVMOO7+EZ4BL2s8nmq9QxC2SFQqRg=";
};
nativeBuildInputs = [
python3
cmake
ninja
];
meta = {
description = "A language server implementation for GLSL";
homepage = "https://github.com/svenstaro/glsl-language-server";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ declan ];
platforms = lib.platforms.linux;
};
})

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, fetchpatch
, git
, fetchCrate
, postgresqlTestHook
, postgresql
}:
@ -12,13 +9,13 @@ rustPlatform.buildRustPackage rec {
pname = "reshape";
version = "0.6.1";
src = fetchFromGitHub {
owner = "fabianlindfors";
repo = pname;
rev = "v${version}";
hash = "sha256-iX8qhDk0PP0AB3bJ6ck8AZ9SCErFH416ggAkgK8O900=";
src = fetchCrate {
inherit pname version;
hash = "sha256-pTEOVDeCE69dn005nj1ULGKjguCtC1uReI/l3WEz4+w=";
};
cargoHash = "sha256-KYU5drTVHdWmlE01Fq1TxJZTe87yBpDKIGm4P+RRCGw=";
nativeCheckInputs = [
postgresqlTestHook
postgresql
@ -32,18 +29,10 @@ rustPlatform.buildRustPackage rec {
postgresqlTestUserOptions = "LOGIN SUPERUSER";
# upstream doesn't ship a Cargo.lock, is generated by the update script
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
cargoLock.lockFile = ./Cargo.lock;
cargoHash = "sha256-UL/vP8055JRbbf5bqf0V3wGh+iF9ztVhyoMrtNs/c+4=";
meta = with lib; {
description = "An easy-to-use, zero-downtime schema migration tool for Postgres";
homepage = "https://github.com/fabianlindfors/reshape";
changelog = "https://github.com/fabianlindfors/reshape/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ ilyakooo0 ];
};

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
version = "0.1.40";
version = "0.1.41";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zsQHVnFMMPZosGtA6ugJSFONrA1tS5Z2UoGr5IEpiAc=";
sha256 = "sha256-LfPhs3hTM47ktDSSC5TVYQoJa4OzMfL7zKLWV4d6bAA=";
};
cargoHash = "sha256-dEDpl2dnD+IDGtHQTT15QTfRIC2t+scsdyUYVqDSHJk=";
cargoHash = "sha256-NBxQ75J60kZX6ASk3/42N5JT6pDLEZpnZtUCgRDOvSY=";
nativeBuildInputs = [ pkg-config ];

View File

@ -9,13 +9,13 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.82.4";
version = "1.83.5";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-lxdIwLhyFDKh3Gb2hkbZcamDEf4DdGEWkaizkGod0Eo=";
sha256 = "sha256-rTM8DRFMDBG+bLMlKwQimacYD2is5SxAg52ff37sz5Q=";
};
vendorSha256 = "sha256-/jYZp0bZUIHUn2Tmbgrpvz3mTQt3rF14wbcvWhEUAzw=";

View File

@ -1,18 +1,23 @@
{ fetchurl, jdk17_headless, lib, makeWrapper, stdenv }:
{
fetchurl,
jdk17_headless,
lib,
makeBinaryWrapper,
stdenv
}:
let
jre = jdk17_headless;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "questdb";
version = "7.2.1";
version = "7.3";
src = fetchurl {
url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz";
sha256 = "sha256-PtVY1cZl/2RQ3YaEBVXpAoZrMRQbv7d1BDFdTwXI+Uk=";
url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
hash = "sha256-teZ9oJ5aUPs0aTUxyK9UmpFRclHZVLEVl0jlWbrbiBs=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeBinaryWrapper
];
installPhase = ''
runHook preInstall
@ -22,16 +27,16 @@ stdenv.mkDerivation rec {
cp questdb.jar $out/share/java
ln -s $out/share/java/questdb.jar $out/bin
wrapProgram $out/bin/questdb.sh --set JAVA_HOME "${jre}"
wrapProgram $out/bin/questdb.sh --set JAVA_HOME "${jdk17_headless}"
runHook postInstall
'';
meta = with lib; {
meta = {
description = "high-performance, open-source SQL database for applications in financial services, IoT, machine learning, DevOps and observability";
homepage = "https://questdb.io/";
license = licenses.asl20;
maintainers = [ maintainers.jacfal ];
platforms = platforms.linux;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.jacfal ];
platforms = lib.platforms.linux;
};
}
})

View File

@ -16,8 +16,8 @@ let
sha256 = {
x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U=";
x86_64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI=";
aarch64-darwin = "sha256-VB5075VfQRtlLoG3lfkVz8ASoODiwleTYC2JJR51LtI=";
x86_64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY=";
aarch64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY=";
}.${system} or throwSystem;
version = "16.7.6";

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "harmonia";
version = "0.6.7";
version = "0.7.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "refs/tags/${pname}-v${version}";
hash = "sha256-3tf2lFMrZowRL3v4bkkhyPdULKUZ5w7zJLXlWyMJg3k=";
hash = "sha256-g4ebmMmH+1DZwqGFNGe2cepHRoJfWtdjDEbQxtnORJI=";
};
cargoHash = "sha256-g/f0+sj3XBjDFfSCLNlyqFehODsmf87hwbmobo6Tehg=";
cargoHash = "sha256-Zg5nvx/bBqj1OrG1X+/2pdLK7ITgiEEEa/hYQUqw3NU=";
nativeBuildInputs = [
pkg-config nix

View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
version = "0.5.8";
version = "0.5.9";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
sha256 = "sha256-murez5uHLv1YXIaDDaFXCDPPggK1GAXjaSmZJhlqN80=";
sha256 = "sha256-uilVJz1MnMF3i/ZXY0bIoSK3uAzfxWuHfhoOSmQgY/I=";
};
doCheck = true;
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config nix ];
cargoSha256 = "sha256-+6I6+LZs84OcyebAIg/9KeAxV1UdK9IgaT7UsPJ5rWQ=";
cargoSha256 = "sha256-02noJcbtml4MxRCjaWtjOWLTUNOQnKy3GCsil31J6F8=";
meta = with lib; {
description = "An interactive Nix documentation tool";

View File

@ -11,12 +11,12 @@
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
hash = "sha256-RexpBkQsSbdezRxToWX/GFKMdivfcp7JhBl1Xbb6Xdw=";
hash = "sha256-5rhsYKYKKOxv9aL2dPcFehdHcO58+ptG4CWaSYR6lfo=";
};
buildInputs = [
boost

View File

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "0.19.2";
version = "0.19.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
hash = "sha256-FyQcsKCHsAB8BmPxeIZdiidaxyNi/5bFA/ilGydDVM0=";
hash = "sha256-+WD+SV/L3TvksWBIg6jk+T0dUTNdp4VKONzdzVT+pac=";
};
makeWrapperArgs = [

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gtree";
version = "1.9.3";
version = "1.9.4";
src = fetchFromGitHub {
owner = "ddddddO";
repo = "gtree";
rev = "v${version}";
hash = "sha256-cQO34m78lvgfbDf+Ok0Yo3rnou8ndGfegeIy1Z8xuPU=";
hash = "sha256-uTU8HKDNvoLGan5OtZxujtEJvAzEhi0L/Z2AgdrDAfU=";
};
vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM=";

View File

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kdiff3";
version = "1.10.4";
version = "1.10.5";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-sq//S3pJib9KCjeGfyW3a6uI3zq2Wi99QJp7S+0HBZ0=";
sha256 = "sha256-2wMm0khBGnqaxBMBx/8O83ecvwQKMw/yhQDdwtTxjIw=";
};
buildInputs = [ boost ];

View File

@ -8887,7 +8887,9 @@ with pkgs;
hardinfo = callPackage ../tools/system/hardinfo { };
harmonia = callPackage ../tools/package-management/harmonia { };
harmonia = callPackage ../tools/package-management/harmonia {
nix = nixVersions.unstable;
};
hayagriva = callPackage ../tools/typesetting/hayagriva { };
@ -13564,6 +13566,8 @@ with pkgs;
timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
timelens = callPackage ../applications/video/timelens { };
timetrap = callPackage ../applications/office/timetrap { };
timetagger = callPackage ../servers/timetagger { };
@ -18225,6 +18229,8 @@ with pkgs;
fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { };
glslls = callPackage ../development/tools/language-servers/glslls { };
gopls = callPackage ../development/tools/language-servers/gopls { };
helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
@ -22586,7 +22592,7 @@ with pkgs;
libfabric = callPackage ../development/libraries/libfabric { };
libfive = libsForQt5.callPackage ../development/libraries/libfive { };
libfive = qt6Packages.callPackage ../development/libraries/libfive { };
libfixposix = callPackage ../development/libraries/libfixposix { };
@ -27915,6 +27921,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
libraqm = callPackage ../development/libraries/libraqm { };
libraw = callPackage ../development/libraries/libraw { };
libraw1394 = callPackage ../development/libraries/libraw1394 { };
@ -32357,6 +32365,10 @@ with pkgs;
waybar = callPackage ../applications/misc/waybar { };
waybar-hyprland = callPackage ../applications/misc/waybar {
hyprlandSupport = true;
};
waycorner = callPackage ../applications/misc/waycorner { };
waylock = callPackage ../applications/misc/waylock {
@ -40282,7 +40294,7 @@ with pkgs;
dnadd = callPackage ../tools/nix/dnadd { };
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
nix = nixVersions.nix_2_16;
nix = nixVersions.nix_2_17;
};
nix-doc = callPackage ../tools/package-management/nix-doc { };

View File

@ -5854,10 +5854,9 @@ self: super: with self; {
pythonSupport = true;
});
libgpiod = toPythonModule (pkgs.libgpiod.override {
enablePython = true;
python3 = python;
});
libgpiod = callPackage ../development/python-modules/libgpiod {
inherit (pkgs) libgpiod;
};
libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { inherit (self) boost; };

View File

@ -3651,6 +3651,16 @@
};
version = "7.0.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.8.1";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default"];