Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-11-07 00:02:31 +00:00 committed by GitHub
commit 38bc2a577e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
154 changed files with 10001 additions and 4391 deletions

View file

@ -275,7 +275,7 @@ pullImage {
`nix-prefetch-docker` command can be used to get required image parameters:
```ShellSession
$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5
$ nix run nixpkgs#nix-prefetch-docker -- --image-name mysql --image-tag 5
```
Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on.

View file

@ -104,6 +104,8 @@
- hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable).
- [zwave-js](https://github.com/zwave-js/zwave-js-server), a small server wrapper around Z-Wave JS to access it via a WebSocket. Available as [services.zwave-js](#opt-services.zwave-js.enable).
- [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs.
Available as [services.honk](#opt-services.honk.enable).

View file

@ -564,6 +564,7 @@
./services/home-automation/home-assistant.nix
./services/home-automation/homeassistant-satellite.nix
./services/home-automation/zigbee2mqtt.nix
./services/home-automation/zwave-js.nix
./services/logging/SystemdJournal2Gelf.nix
./services/logging/awstats.nix
./services/logging/filebeat.nix

View file

@ -0,0 +1,152 @@
{config, pkgs, lib, ...}:
with lib;
let
cfg = config.services.zwave-js;
mergedConfigFile = "/run/zwave-js/config.json";
settingsFormat = pkgs.formats.json {};
in {
options.services.zwave-js = {
enable = mkEnableOption (mdDoc "the zwave-js server on boot");
package = mkPackageOptionMD pkgs "zwave-js-server" { };
port = mkOption {
type = types.port;
default = 3000;
description = mdDoc ''
Port for the server to listen on.
'';
};
serialPort = mkOption {
type = types.path;
description = mdDoc ''
Serial port device path for Z-Wave controller.
'';
example = "/dev/ttyUSB0";
};
secretsConfigFile = mkOption {
type = types.path;
description = mdDoc ''
JSON file containing secret keys. A dummy example:
```
{
"securityKeys": {
"S0_Legacy": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"S2_Unauthenticated": "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB",
"S2_Authenticated": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
"S2_AccessControl": "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"
}
}
```
See
<https://zwave-js.github.io/node-zwave-js/#/getting-started/security-s2>
for details. This file will be merged with the module-generated config
file (taking precedence).
Z-Wave keys can be generated with:
{command}`< /dev/urandom tr -dc A-F0-9 | head -c32 ;echo`
::: {.warning}
A file in the nix store should not be used since it will be readable to
all users.
:::
'';
example = "/secrets/zwave-js-keys.json";
};
settings = mkOption {
type = lib.types.submodule {
freeformType = settingsFormat.type;
options = {
storage = {
cacheDir = mkOption {
type = types.path;
default = "/var/cache/zwave-js";
readOnly = true;
description = lib.mdDoc "Cache directory";
};
};
};
};
default = {};
description = mdDoc ''
Configuration settings for the generated config
file.
'';
};
extraFlags = lib.mkOption {
type = with lib.types; listOf str;
default = [ ];
example = [ "--mock-driver" ];
description = lib.mdDoc ''
Extra flags to pass to command
'';
};
};
config = mkIf cfg.enable {
systemd.services.zwave-js = let
configFile = settingsFormat.generate "zwave-js-config.json" cfg.settings;
in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
description = "Z-Wave JS Server";
serviceConfig = {
ExecStartPre = ''
/bin/sh -c "${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${configFile} ${cfg.secretsConfigFile} > ${mergedConfigFile}"
'';
ExecStart = lib.concatStringsSep " " [
"${cfg.package}/bin/zwave-server"
"--config ${mergedConfigFile}"
"--port ${toString cfg.port}"
cfg.serialPort
(escapeShellArgs cfg.extraFlags)
];
Restart = "on-failure";
User = "zwave-js";
SupplementaryGroups = [ "dialout" ];
CacheDirectory = "zwave-js";
RuntimeDirectory = "zwave-js";
# Hardening
CapabilityBoundingSet = "";
DeviceAllow = [cfg.serialPort];
DevicePolicy = "closed";
DynamicUser = true;
LockPersonality = true;
MemoryDenyWriteExecute = false;
NoNewPrivileges = true;
PrivateUsers = true;
PrivateTmp = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
RemoveIPC = true;
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service @pkey"
"~@privileged @resources"
];
UMask = "0077";
};
};
};
meta.maintainers = with lib.maintainers; [ graham33 ];
}

View file

@ -493,6 +493,8 @@ in
services.phpfpm.pools.mediawiki = {
inherit user group;
phpEnv.MEDIAWIKI_CONFIG = "${mediawikiConfig}";
# https://www.mediawiki.org/wiki/Compatibility
phpPackage = pkgs.php81;
settings = (if (cfg.webserver == "apache") then {
"listen.owner" = config.services.httpd.user;
"listen.group" = config.services.httpd.group;
@ -552,24 +554,20 @@ in
deny all;
'';
# MediaWiki assets (usually images)
"~ ^/w/resources/(assets|lib|src)" = {
tryFiles = "$uri =404";
extraConfig = ''
add_header Cache-Control "public";
expires 7d;
'';
};
"~ ^/w/resources/(assets|lib|src)".extraConfig = ''
rewrite ^/w(/.*) $1 break;
add_header Cache-Control "public";
expires 7d;
'';
# Assets, scripts and styles from skins and extensions
"~ ^/w/(skins|extensions)/.+\\.(css|js|gif|jpg|jpeg|png|svg|wasm|ttf|woff|woff2)$" = {
tryFiles = "$uri =404";
extraConfig = ''
add_header Cache-Control "public";
expires 7d;
'';
};
"~ ^/w/(skins|extensions)/.+\\.(css|js|gif|jpg|jpeg|png|svg|wasm|ttf|woff|woff2)$".extraConfig = ''
rewrite ^/w(/.*) $1 break;
add_header Cache-Control "public";
expires 7d;
'';
# Handling for Mediawiki REST API, see [[mw:API:REST_API]]
"/w/rest.php".tryFiles = "$uri $uri/ /rest.php?$query_string";
"/w/rest.php/".tryFiles = "$uri $uri/ /w/rest.php?$query_string";
# Handling for the article path (pretty URLs)
"/wiki/".extraConfig = ''

View file

@ -253,9 +253,6 @@ done
@setHostId@
# Load the required kernel modules.
mkdir -p /lib
ln -s @modulesClosure@/lib/modules /lib/modules
ln -s @modulesClosure@/lib/firmware /lib/firmware
echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
for i in @kernelModules@; do
info "loading module $(basename $i)..."

View file

@ -307,7 +307,7 @@ let
${pkgs.buildPackages.busybox}/bin/ash -n $target
'';
inherit linkUnits udevRules extraUtils modulesClosure;
inherit linkUnits udevRules extraUtils;
inherit (config.boot) resumeDevice;
@ -349,6 +349,9 @@ let
[ { object = bootStage1;
symlink = "/init";
}
{ object = "${modulesClosure}/lib";
symlink = "/lib";
}
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
preferLocalBuild = true;

View file

@ -934,4 +934,5 @@ in {
zram-generator = handleTest ./zram-generator.nix {};
zrepl = handleTest ./zrepl.nix {};
zsh-history = handleTest ./zsh-history.nix {};
zwave-js = handleTest ./zwave-js.nix {};
}

31
nixos/tests/zwave-js.nix Normal file
View file

@ -0,0 +1,31 @@
import ./make-test-python.nix ({ pkgs, lib, ...} :
let
secretsConfigFile = pkgs.writeText "secrets.json" (builtins.toJSON {
securityKeys = {
"S0_Legacy" = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
};
});
in {
name = "zwave-js";
meta.maintainers = with lib.maintainers; [ graham33 ];
nodes = {
machine = { config, ... }: {
services.zwave-js = {
enable = true;
serialPort = "/dev/null";
extraFlags = ["--mock-driver"];
inherit secretsConfigFile;
};
};
};
testScript = ''
start_all()
machine.wait_for_unit("zwave-js.service")
machine.wait_for_open_port(3000)
machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'")
'';
})

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.2.12";
version = "1.2.13";
src = fetchurl {
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-a3ts+7wiEwcoLPj6KsfP9lvTNTDSr9t+qEujSgpotXo=";
sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo=";
};
outputs = [ "out" "dev" "doc" ];

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja
, wrapGAppsHook, pkg-config, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive
, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium
, shared-mime-info, libhandy, fira, sassc
}:
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
appstream-glib wrapGAppsHook sassc gobject-introspection ];
buildInputs = [ glib pythonEnv gtk3
gnome.adwaita-icon-theme webkitgtk gspell texlive
gnome.adwaita-icon-theme webkitgtk gspell texliveMedium
glib-networking libhandy ];
postPatch = ''
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
--prefix PATH : "${texlive}/bin"
--prefix PATH : "${texliveMedium}/bin"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
'';

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texlive, perl, ghostscript }:
{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texliveMedium, perl, ghostscript }:
stdenv.mkDerivation rec {
pname = "ne";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
'';
nativeBuildInputs = [ texlive.combined.scheme-medium texinfo6 perl ghostscript ];
nativeBuildInputs = [ texliveMedium texinfo6 perl ghostscript ];
buildInputs = [ ncurses ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

View file

@ -2,7 +2,7 @@
guile_1_8, xmodmap, which, freetype,
libjpeg,
sqlite,
tex ? null,
texliveSmall ? null,
aspell ? null,
git ? null,
python3 ? null,
@ -23,7 +23,8 @@ let
pname = "texmacs";
version = "2.1.2";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
inherit extraFonts chineseFonts japaneseFonts koreanFonts;
tex = texliveSmall;
};
in
stdenv.mkDerivation {
@ -70,7 +71,7 @@ stdenv.mkDerivation {
which
ghostscriptX
aspell
tex
texliveSmall
git
python3
])

View file

@ -13,7 +13,7 @@
, libspiro
, lua5
, qtbase
, texlive
, texliveSmall
, wrapQtAppsHook
, zlib
, withTeXLive ? true
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
qtbase
zlib
] ++ (lib.optionals withTeXLive [
texlive
texliveSmall
]);
makeFlags = [
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
"IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
];
qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];
qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ];
enableParallelBuilding = true;

View file

@ -10,7 +10,7 @@
, expat
, bwidget
, python3
, texlive
, texliveTeTeX
, survex
, makeWrapper
, fmt
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
pkg-config
perl
python3
texlive.combined.scheme-tetex
texliveTeTeX
makeWrapper
tcl.tclPackageHook
];
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
fixupPhase = ''
runHook preFixup
wrapProgram $out/bin/therion \
--prefix PATH : ${lib.makeBinPath [ survex texlive.combined.scheme-tetex ]}
--prefix PATH : ${lib.makeBinPath [ survex texliveTeTeX ]}
wrapProgram $out/bin/xtherion \
--prefix PATH : ${lib.makeBinPath [ tk ]}
runHook postFixup

View file

@ -1,6 +1,6 @@
{ callPackage, texlive }:
{ callPackage, texliveMedium }:
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) {
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) {
zettlr = {
version = "3.0.2";
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";

View file

@ -4,7 +4,7 @@
, appimageTools
, lib
, fetchurl
, texlive
, texliveMedium
, pandoc
}:
@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
inherit name src;
multiArch = false; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.53.0";
version = "0.53.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Y3the1+p+ZAkPxKnScNIup7cfyTtE2LU3IdghA0mOY8=";
hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo=";
};
vendorHash = "sha256-5O3souGEosqLFxZpGbak4r57V39lR6X8mEPgfad3X5Q=";
vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo=";
doCheck = false;

View file

@ -1,7 +1,7 @@
{ lib
, newScope
, pidgin
, texlive
, texliveBasic
, config
}:
@ -19,7 +19,7 @@ lib.makeScope newScope (self:
pidgin-indicator = callPackage ./pidgin-indicator { };
pidgin-latex = callPackage ./pidgin-latex {
texLive = texlive.combined.scheme-basic;
texLive = texliveBasic;
};
pidgin-msn-pecan = callPackage ./msn-pecan { };

View file

@ -1,58 +1,92 @@
{ mkDerivation, lib, stdenv, fetchFromGitHub, pkg-config
, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
, debugSupport ? false
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
, trackerSearch ? true, python3 ? null
{ lib
, stdenv
, fetchFromGitHub
, boost
, cmake
, Cocoa
, libtorrent-rasterbar
, ninja
, qtbase
, qtsvg
, qttools
, wrapQtAppsHook
, guiSupport ? true
, dbus
, qtwayland
, trackerSearch ? true
, python3
, webuiSupport ? true
}:
assert guiSupport -> (dbus != null);
assert trackerSearch -> (python3 != null);
mkDerivation rec {
pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
version = "4.5.5";
let
qtVersion = lib.versions.major qtbase.version;
in
stdenv.mkDerivation rec {
pname = "qbittorrent"
+ lib.optionalString (guiSupport && qtVersion == "5") "-qt5"
+ lib.optionalString (!guiSupport) "-nox";
version = "4.6.0";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
hash = "sha256-rWv+KGw+3385GOKK4MvoSP0CepotUZELiDVFpyDf+9k=";
hash = "sha256-o9zMGjVCXLqdRdXzRs1kFPDMFJXQWBEtWwIfeIyFxJw=";
};
enableParallelBuilding = true;
nativeBuildInputs = [
cmake
ninja
wrapQtAppsHook
];
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ pkg-config ];
buildInputs = [
boost
libtorrent-rasterbar
qtbase
qtsvg
qttools
] ++ lib.optionals stdenv.isDarwin [
Cocoa
] ++ lib.optionals guiSupport [
dbus
] ++ lib.optionals (guiSupport && stdenv.isLinux) [
qtwayland
] ++ lib.optionals trackerSearch [
python3
];
buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support
++ lib.optional trackerSearch python3;
cmakeFlags = lib.optionals (qtVersion == "6") [
"-DQT6=ON"
] ++ lib.optionals (!guiSupport) [
"-DGUI=OFF"
"-DSYSTEMD=ON"
"-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system"
] ++ lib.optionals (!webuiSupport) [
"-DWEBUI=OFF"
];
# Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
QMAKE_LRELEASE = "lrelease";
configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
"--with-boost=${boost.dev}" ]
++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files
++ lib.optional (!webuiSupport) "--disable-webui"
++ lib.optional debugSupport "--enable-debug";
qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}";
qtWrapperArgs = lib.optionals trackerSearch [
"--prefix PATH : ${lib.makeBinPath [ python3 ]}"
];
postInstall = lib.optionalString stdenv.isDarwin ''
APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"}
mkdir -p $out/{Applications,bin}
cp -R src/${pname}.app $out/Applications
makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname}
cp -R $APP_NAME.app $out/Applications
makeWrapper $out/{Applications/$APP_NAME.app/Contents/MacOS,bin}/$APP_NAME
'';
meta = with lib; {
description = "Featureful free software BitTorrent client";
homepage = "https://www.qbittorrent.org/";
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ Anton-Latukha kashw2 ];
homepage = "https://www.qbittorrent.org";
changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ Anton-Latukha kashw2 paveloom ];
};
}

View file

@ -13,7 +13,7 @@
, gettext
, gobject-introspection
, gdk-pixbuf
, texlive
, texliveSmall
, imagemagick
, perlPackages
, writeScript
@ -21,9 +21,7 @@
let
documentation_deps = [
(texlive.combine {
inherit (texlive) scheme-small wrapfig gensymb;
})
(texliveSmall.withPackages (ps: with ps; [ wrapfig gensymb ]))
xvfb-run
imagemagick
perlPackages.Po4a

View file

@ -8,7 +8,7 @@
, blas-ilp64
, hdf5-cpp
, python3
, texlive
, texliveMinimal
, armadillo
, libxc
, makeWrapper
@ -78,7 +78,7 @@ stdenv.mkDerivation {
perl
gfortran
cmake
texlive.combined.scheme-minimal
texliveMinimal
makeWrapper
autoPatchelfHook
];

View file

@ -16,7 +16,7 @@
, trilinos
, withMPI ? false
# for doc
, texlive
, texliveMedium
, pandoc
, enableDocs ? true
# for tests
@ -81,16 +81,14 @@ stdenv.mkDerivation rec {
gfortran
libtool_2
] ++ lib.optionals enableDocs [
(texlive.combine {
inherit (texlive)
scheme-medium
(texliveMedium.withPackages (ps: with ps; [
koma-script
optional
framed
enumitem
multirow
preprint;
})
preprint
]))
];
buildInputs = [

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texLive, tk, xz, zlib
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
, withRecommendedPackages ? true
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu
bison imake which blas lapack curl tcl tk jdk tzdata
] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas
{ stdenv, lib, fetchurl, fetchpatch, texliveSmall, bison, flex, lapack, blas
, autoreconfHook, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
, buildPackages, readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGL, libGLU, xorg, fltk
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
autoreconfHook texlive.combined.scheme-small bison flex
autoreconfHook texliveSmall bison flex
];
# perl is only needed for patchShebangs fixup.

View file

@ -7,7 +7,7 @@
, libpthreadstubs
, perl
, readline
, tex
, texliveBasic
, withThread ? true
}:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
libX11
perl
readline
tex
texliveBasic
] ++ lib.optionals withThread [
libpthreadstubs
];

View file

@ -17,7 +17,7 @@
# use letters instead of numbers for post-appendix chapters, and we
# want it to match the upstream format because sage depends on it.
, texinfo4
, texlive
, texliveSmall
, enableDocs ? !stdenv.isDarwin
, enableGfanlib ? true
}:
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
graphviz
latex2html
texinfo4
texlive.combined.scheme-small
texliveSmall
] ++ lib.optionals stdenv.isDarwin [ getconf ];
depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -1,21 +1,21 @@
{ buildGoModule
{ lib
, buildGoModule
, fetchFromGitHub
, lib
, nix-update-script
}:
buildGoModule rec {
pname = "gut";
version = "0.2.10";
version = "0.3.0";
src = fetchFromGitHub {
owner = "julien040";
repo = "gut";
rev = version;
hash = "sha256-y6GhLuTqOaxAQjDgqh1ivDwGhpYY0a6ZNDdE3Pox3is=";
hash = "sha256-l7yjZEcpsnVisd93EqIug1n0k18m4tUmCQFXC6b63cg=";
};
vendorHash = "sha256-91iyAFD/RPEkMarKKVwJ4t92qosP2Db1aQ6dmNZNDwU=";
vendorHash = "sha256-G9oDMHLmdv/vQfofTqKAf21xaGp+lvW+sedLmaj+A5A=";
ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ];
@ -24,10 +24,10 @@ buildGoModule rec {
passthru.updateScript = nix-update-script { };
meta = {
description = "An easy-to-use git client for Windows, macOS, and Linux";
homepage = "https://github.com/slackhq/go-audit";
maintainers = [ lib.maintainers.paveloom ];
license = [ lib.licenses.mit ];
meta = with lib; {
description = "An alternative git CLI";
homepage = "https://gut-cli.dev";
license = licenses.mit;
maintainers = with maintainers; [ paveloom ];
};
}

View file

@ -4,7 +4,7 @@
, cairo
, ffmpeg
, texlive
, texliveInfraOnly
, python3
}:
@ -21,11 +21,10 @@ let
# https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt
#
# these two combined add up to:
manim-tinytex = {
inherit (texlive)
manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [
# tinytex
scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex
amsfonts amsmath atbegshi atveryend auxhook babel bibtex
bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex
etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec
framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def
@ -41,8 +40,8 @@ let
# manim-latex
standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e
fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super
babel-english gnu-freefont mathastext cbfonts-fd;
};
babel-english gnu-freefont mathastext cbfonts-fd
]);
python = python3.override {
packageOverrides = self: super: {
@ -129,13 +128,13 @@ in python.pkgs.buildPythonApplication rec {
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [
ffmpeg
(texlive.combine manim-tinytex)
manim-tinytex
])
];
nativeCheckInputs = [
ffmpeg
(texlive.combine manim-tinytex)
manim-tinytex
] ++ (with python.pkgs; [
pytest-xdist
pytestCheckHook

View file

@ -19,12 +19,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-markad";
version = "3.3.5";
version = "3.3.6";
src = fetchFromGitHub {
repo = "vdr-plugin-markad";
owner = "kfb77";
sha256 = "sha256-5D4nlGZfmPaNaLx2PoqLRqlbcukpM6DHpCtqmee+cww=";
sha256 = "sha256-aHhQljWE1om/mILM+TXB9uPTrUwNNc4Loiejbakj9NU=";
rev = "V${version}";
};

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }:
stdenv.mkDerivation rec {
pname = "vdr-skin-nopacity";
version = "1.1.14";
version = "1.1.16";
src = fetchFromGitLab {
repo = "SkinNopacity";
owner = "kamel5";
sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ=";
sha256 = "sha256-5TTilBKlNsFBm5BaCoRV1LzZgpad2lOIQGyk94jGYls=";
rev = version;
};

View file

@ -12,12 +12,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-softhddevice";
version = "1.12.1";
version = "1.12.5";
src = fetchFromGitHub {
owner = "ua0lnj";
repo = "vdr-plugin-softhddevice";
sha256 = "sha256-/Q+O/6kK55E+JN1khRvM7F6H/Vnp/OOD80eU4zmrBt8=";
sha256 = "sha256-T+jmsHZA7poxwLSFi9N8ALa0te735HQer9ByH2Wub60=";
rev = "v${version}";
};

View file

@ -1,4 +1,4 @@
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck-minimal }:
let
inherit (lib)
@ -365,12 +365,12 @@ rec {
# GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)
# but we still want to use writeShellApplication on those platforms
let
shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck.compiler;
shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler;
excludeOption = lib.optionalString (excludeShellChecks != [ ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'";
shellcheckCommand = lib.optionalString shellcheckSupported ''
# use shellcheck which does not include docs
# pandoc takes long to build and documentation isn't needed for just running the cli
${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} ${excludeOption} "$target"
${lib.getExe shellcheck-minimal} ${excludeOption} "$target"
'';
in
if checkPhase == null then ''

View file

@ -0,0 +1,69 @@
{ lib
, perlPackages
, fetchFromGitHub
, makeWrapper
, gobject-introspection
, perl
, clamav
}:
perlPackages.buildPerlPackage rec {
pname = "clamtk";
version = "6.16";
src = fetchFromGitHub {
owner = "dave-theunsub";
repo = "clamtk";
rev = "v${version}";
hash = "sha256-o6OaXOXLykTUuF/taKnEhZRV04/3nlU5aNY05ANr1Ko=";
};
nativeBuildInputs = [ makeWrapper gobject-introspection ];
buildInputs = [ perl clamav ];
propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ];
preConfigure = "touch Makefile.PL";
# no tests implemented
doCheck = false;
outputs = [ "out" "man" ];
postPatch = ''
# Set correct nix paths in perl scripts
substituteInPlace lib/App.pm \
--replace /usr/bin/freshclam ${lib.getBin clamav}/bin/freshclam \
--replace /usr/bin/sigtool ${lib.getBin clamav}/bin/sigtool \
--replace /usr/bin/clamscan ${lib.getBin clamav}/bin/clamscan \
--replace /usr/bin/clamdscan ${lib.getBin clamav}/bin/clamdscan \
--replace /usr/share/pixmaps $out/share/pixmaps
# We want to catch the crontab wrapper on NixOS and the
# System crontab on non-NixOS so we don't give a full path.
substituteInPlace lib/Schedule.pm \
--replace "( -e '/usr/bin/crontab' )" "(1)" \
--replace /usr/bin/crontab crontab
'';
installPhase = ''
runHook preInstall
install -D lib/*.pm -t $out/lib/perl5/site_perl/ClamTk
install -D clamtk.desktop -t $out/share/applications
install -D images/* -t $out/share/pixmaps
install -D clamtk.1.gz -t $out/share/man/man1
install -D -m755 clamtk -t $out/bin
wrapProgram $out/bin/clamtk --prefix PERL5LIB : $PERL5LIB --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"
runHook postInstall
'';
meta = with lib; {
description = ''
Easy to use, lightweight front-end for ClamAV (Clam Antivirus).
'';
license = licenses.gpl1Plus;
homepage = "https://github.com/dave-theunsub/clamtk";
platforms = platforms.linux;
maintainers = with maintainers; [ jgarcia ];
};
}

View file

@ -0,0 +1,147 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, cargo
, curl
, fd
, fzf
, git
, gnumake
, gnused
, gnutar
, gzip
, lua-language-server
, neovim
, nodejs
, nodePackages
, ripgrep
, tree-sitter
, unzip
, nvimAlias ? false
, viAlias ? false
, vimAlias ? false
, globalConfig ? ""
}:
stdenv.mkDerivation (finalAttrs: {
inherit nvimAlias viAlias vimAlias globalConfig;
pname = "lunarvim";
version = "1.3.0";
src = fetchFromGitHub {
owner = "LunarVim";
repo = "LunarVim";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-z1Cw3wGpFDmlrAIy7rrjlMtzcW7a6HWSjI+asEDcGPA=";
};
# Pull in the fix for Nerd Fonts until the next release
patches = [
(
fetchpatch {
url = "https://github.com/LunarVim/LunarVim/commit/d187cbd03fbc8bd1b59250869e0e325518bf8798.patch";
sha256 = "sha256-ktkQ2GiIOhbVOMjy1u5Bf8dJP4SXHdG4j9OEFa9Fm7w=";
}
)
];
nativeBuildInputs = [
gnused
makeWrapper
];
runtimeDeps = [
stdenv.cc
cargo
curl
fd
fzf
git
gnumake
gnutar
gzip
lua-language-server
neovim
nodejs
nodePackages.neovim
ripgrep
tree-sitter
unzip
];
buildPhase = ''
runHook preBuild
mkdir -p share/lvim
cp init.lua utils/installer/config.example.lua share/lvim
cp -r lua snapshots share/lvim
mkdir bin
cp utils/bin/lvim.template bin/lvim
chmod +x bin/lvim
# LunarVim automatically copies config.example.lua, but we need to make it writable.
sed -i "2 i\\
if [ ! -f \$HOME/.config/lvim/config.lua ]; then \\
cp $out/share/lvim/config.example.lua \$HOME/.config/lvim/config.lua \\
chmod +w \$HOME/.config/lvim/config.lua \\
fi
" bin/lvim
substituteInPlace bin/lvim \
--replace NVIM_APPNAME_VAR lvim \
--replace RUNTIME_DIR_VAR \$HOME/.local/share/lvim \
--replace CONFIG_DIR_VAR \$HOME/.config/lvim \
--replace CACHE_DIR_VAR \$HOME/.cache/lvim \
--replace BASE_DIR_VAR $out/share/lvim \
--replace nvim ${neovim}/bin/nvim
# Allow language servers to be overridden by appending instead of prepending
# the mason.nvim path.
echo "lvim.builtin.mason.PATH = \"append\"" > share/lvim/global.lua
echo ${ lib.strings.escapeShellArg finalAttrs.globalConfig } >> share/lvim/global.lua
sed -i "s/add_to_path()/add_to_path(true)/" share/lvim/lua/lvim/core/mason.lua
sed -i "/Log:set_level/idofile(\"$out/share/lvim/global.lua\")" share/lvim/lua/lvim/config/init.lua
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r bin share $out
for iconDir in utils/desktop/*/; do
install -Dm444 $iconDir/lvim.svg -t $out/share/icons/hicolor/$(basename $iconDir)/apps
done
install -Dm444 utils/desktop/lvim.desktop -t $out/share/applications
wrapProgram $out/bin/lvim --prefix PATH : ${ lib.makeBinPath finalAttrs.runtimeDeps } \
--prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib} \
--prefix CC : ${stdenv.cc.targetPrefix}cc
'' + lib.optionalString finalAttrs.nvimAlias ''
ln -s $out/bin/lvim $out/bin/nvim
'' + lib.optionalString finalAttrs.viAlias ''
ln -s $out/bin/lvim $out/bin/vi
'' + lib.optionalString finalAttrs.vimAlias ''
ln -s $out/bin/lvim $out/bin/vim
'' + ''
runHook postInstall
'';
meta = with lib; {
description = "IDE layer for Neovim";
homepage = "https://www.lunarvim.org/";
changelog = "https://github.com/LunarVim/LunarVim/blob/${finalAttrs.src.rev}/CHANGELOG.md";
sourceProvenance = with sourceTypes; [ fromSource ];
license = licenses.gpl3Only;
maintainers = with maintainers; [ prominentretail ];
platforms = platforms.unix;
mainProgram = "lvim";
};
})

View file

@ -45,6 +45,6 @@ stdenv.mkDerivation (attrs: {
license = licenses.mit;
sourceProvenance = [ sourceTypes.binaryBytecode ];
maintainers = [ maintainers.mdarocha ];
platforms = [ "x86_64-linux" ];
inherit (mono.meta) platforms;
};
})

View file

@ -0,0 +1,36 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, nixosTests
}:
buildNpmPackage rec {
pname = "zwave-js-server";
version = "1.33.0";
src = fetchFromGitHub {
owner = "zwave-js";
repo = pname;
rev = version;
hash = "sha256-Lll3yE1v4ybJTjKO8dhPXMD/3VCn+9+fpnN7XczqaE4=";
};
npmDepsHash = "sha256-Re9fo+9+Z/+UGyDPlNWelH/4tLxcITPYXOCddQE9YDY=";
# For some reason the zwave-js dependency is in devDependencies
npmFlags = [ "--include=dev" ];
passthru = {
tests = {
inherit (nixosTests) zwave-js;
};
};
meta = {
changelog = "https://github.com/zwave-js/zwave-js-server/releases/tag/${version}";
description = "Small server wrapper around Z-Wave JS to access it via a WebSocket";
license = lib.licenses.asl20;
homepage = "https://github.com/zwave-js/zwave-js-server";
maintainers = with lib.maintainers; [ graham33 ];
};
}

View file

@ -1,7 +1,7 @@
{ lib, stdenvNoCC, fetchzip }:
let
version = "1.3.8";
version = "1.3.9";
mkPretendard = { pname, typeface, hash }:
stdenvNoCC.mkDerivation {
@ -35,24 +35,24 @@ in
pretendard = mkPretendard {
pname = "pretendard";
typeface = "Pretendard";
hash = "sha256-Re4Td9uA8Qn/xv39Bo9i3gShYWQ1mRX44Vyx7/i4xwI=";
hash = "sha256-n7RQApffpL/8ojHcZbdxyanl9Tlc8HP8kxLFBdArUfY=";
};
pretendard-gov = mkPretendard {
pname = "pretendard-gov";
typeface = "PretendardGOV";
hash = "sha256-GQv/Ia91QgXZwFX+WdE7aRFUJFWhCMLFY86gu4Ii2w8=";
hash = "sha256-qoDUBOmrk6WPKQgnapThfKC01xWup+HN82hcoIjEe0M=";
};
pretendard-jp = mkPretendard {
pname = "pretendard-jp";
typeface = "PretendardJP";
hash = "sha256-7OLInF1XUQxyHyb9a0zyfCLZrdcxMTM2QeBe3lwLJ0A=";
hash = "sha256-1nTk1LPoRSfSDgDuGWkcs6RRIY4ZOqDBPMsxezMos6Q=";
};
pretendard-std = mkPretendard {
pname = "pretendard-std";
typeface = "PretendardStd";
hash = "sha256-DCR6KUAblVjhapqMn2p0nzndEJm4OCawGV3nAWZvSBs=";
hash = "sha256-gkYqqxSICmSIrBuPRzBaOlGGM/rJU1z7FiFvu9RhK5s=";
};
}

View file

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchzip
, tex
, texliveMedium
, buildDocs ? false
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "doc" "man" ];
nativeBuildInputs = lib.optionals buildDocs [ tex ];
nativeBuildInputs = lib.optionals buildDocs [ texliveMedium ];
postPatch = lib.optionalString (!buildDocs) ''
substituteInPlace Makefile --replace "all: binaries docs" "all: binaries"

View file

@ -19,7 +19,7 @@
, gmp-static
, verilog
, asciidoctor
, tex
, texliveFull
, which
}:
@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
ghcWithPackages
perl
pkg-config
tex
texliveFull
];
makeFlags = [

View file

@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.31.0";
version = "0.32.2";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MLR7gY4NPb223NiPvTih88DQO2LvaYHsduWSH9QQa6M=";
hash = "sha256-1FIeH4NFyYQinqzCBZ9m2Jm6f5tLJDJxVdb4D3+fQ4w=";
};
nativeBuildInputs = [ git pkg-config ];
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security libiconv ];
cargoHash = "sha256-I+5Vrpy5/9wFMB2dQYH9aqf/VonkDyIAyJmSHm5S6mk=";
cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI=";
passthru.updateScript = nix-update-script { };

View file

@ -13,7 +13,7 @@
# docs
, help2man
, texinfo
, texlive
, texliveBasic
# test
, writeText
}:
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libtool
help2man
texinfo
texlive.combined.scheme-basic
texliveBasic
];
buildInputs = [

View file

@ -4,7 +4,7 @@
, makeWrapper
, gnum4
, texinfo
, texLive
, texliveSmall
, automake
, autoconf
, libtool
@ -85,7 +85,7 @@ stdenv.mkDerivation {
$out/lib/mit-scheme${arch}-${version}
'';
nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ];
nativeBuildInputs = [ makeWrapper gnum4 texinfo (texliveSmall.withPackages (ps: with ps; [ epsf ps.texinfo ])) automake ghostscript autoconf libtool ];
# XXX: The `check' target doesn't exist.
doCheck = false;

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf
, libftdi1, readline
# documentation building is broken on darwin
, docSupport ? (!stdenv.isDarwin), texlive, texinfo, texi2html, unixtools }:
, docSupport ? (!stdenv.isDarwin), texliveMedium, texinfo, texi2html, unixtools }:
stdenv.mkDerivation rec {
pname = "avrdude";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [
unixtools.more
texlive.combined.scheme-medium
texliveMedium
texinfo
texi2html
];

View file

@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null;
stdenv.mkDerivation rec {
pname = "aravis";
version = "0.8.28";
version = "0.8.30";
src = fetchFromGitHub {
owner = "AravisProject";
repo = pname;
rev = version;
sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA=";
sha256 = "sha256-1OxvLpzEKxIXiLJIUr+hCx+sxnH9Z5dBM5Lug1acCok=";
};
outputs = [ "bin" "dev" "out" "lib" ];

View file

@ -2,7 +2,7 @@
, fetchFromGitHub
, gmp
, autoreconfHook
, texlive
, texliveSmall
}:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [gmp];
nativeBuildInputs = [
autoreconfHook
texlive.combined.scheme-small # for building the documentation
texliveSmall # for building the documentation
];
# No actual checks yet (2018-05-05), but maybe one day.
# Requested here: https://github.com/cddlib/cddlib/issues/25

View file

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
description = "Rime Input Method Engine, the core library";
license = licenses.bsd3;
maintainers = with maintainers; [ vonfry ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

View file

@ -42,6 +42,11 @@ in stdenv.mkDerivation {
moveToOutput "lib/${python.libPrefix}" "$python"
'';
postFixup = ''
substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib" "$out/lib"
'';
outputs = [ "out" "dev" "python" ];
cmakeFlags = [

View file

@ -0,0 +1,34 @@
From 4e8bd61c216969615a492043092bd8298dcd1410 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 6 Nov 2023 09:33:45 -0500
Subject: [PATCH] hardcode install_dir
partially revert https://github.com/elFarto/nvidia-vaapi-driver/commit/60ab79608ae35bd929d3e1387d226547d18e6bed
---
meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 990c2b2..f5e63d7 100644
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,6 @@ if gst_codecs_deps.found()
endif
nvidia_incdir = include_directories('nvidia-include')
-nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir')
shared_library(
'nvidia_drv_video',
@@ -80,7 +79,7 @@ shared_library(
dependencies: deps,
include_directories: nvidia_incdir,
install: true,
- install_dir: nvidia_install_dir,
+ install_dir: get_option('libdir') / 'dri',
gnu_symbol_visibility: 'hidden',
)
--
2.42.0

View file

@ -14,15 +14,19 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
version = "0.0.10";
version = "0.0.11";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
rev = "v${version}";
sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0=";
sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20=";
};
patches = [
./0001-hardcode-install_dir.patch
];
nativeBuildInputs = [
meson
ninja

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM=";
};
latex = texlive.combine { inherit (texlive)
scheme-basic
latex = texliveBasic.withPackages (ps: with ps; [
collection-pstricks
collection-fontsrecommended
l3kernel
@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
xcolor
xkeyval
xstring
;};
]);
nativeBuildInputs = [ rsync makeWrapper ];
buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ];

View file

@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "piper-phonemize";
version = "2023.9.27-2";
version = "2023.11.6-1";
src = fetchFromGitHub {
owner = "rhasspy";
repo = "piper-phonemize";
rev = "refs/tags/${version}";
hash = "sha256-Rwl8D5ZX9sGdxEch+l7pXdbf4nPCuSfGrK5x/EQ+O60=";
hash = "sha256-IRvuA03Z6r8Re/ocq2G/r28uwI9RU3xmmNI7S2G40rc=";
};
nativeBuildInputs = [

View file

@ -39,7 +39,7 @@
, dia
, tetex ? null
, ghostscript ? null
, texlive ? null
, texliveMedium ? null
# generates python bindings
, pythonSupport ? true
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ]
++ lib.optionals withManual [ dia tetex ghostscript imagemagick texlive.combined.scheme-medium ]
++ lib.optionals withManual [ dia tetex ghostscript imagemagick texliveMedium ]
++ [
libxml2
pythonEnv

View file

@ -49,6 +49,7 @@ mapAliases {
"@mermaid-js/mermaid-cli" = pkgs.mermaid-cli; # added 2023-10-01
"@nerdwallet/shepherd" = pkgs.shepherd; # added 2023-09-30
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
"@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
alloy = pkgs.titanium-alloy; # added 2023-08-17
antennas = pkgs.antennas; # added 2023-07-30
inherit (pkgs) asar; # added 2023-08-26

View file

@ -60,5 +60,4 @@
vscode-html-languageserver-bin = "html-languageserver";
vscode-json-languageserver-bin = "json-languageserver";
webtorrent-cli = "webtorrent";
"@zwave-js/server" = "zwave-server";
}

View file

@ -310,5 +310,4 @@
, "@yaegassy/coc-nginx"
, "yalc"
, "yarn"
, "@zwave-js/server"
]

View file

@ -102095,205 +102095,4 @@ in
bypassCache = true;
reconstructLock = true;
};
"@zwave-js/server" = nodeEnv.buildNodePackage {
name = "_at_zwave-js_slash_server";
packageName = "@zwave-js/server";
version = "1.33.0";
src = fetchurl {
url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.33.0.tgz";
sha512 = "jHRpbeWcDVhTWidDTmln9x+lTveJ0H1cLJxl6dWIeWQ6YnB7YzRuHFDPhY+6ewAyUrc+Eq8tl+QnhjmVuevq+A==";
};
dependencies = [
(sources."@alcalzone/jsonl-db-3.1.0" // {
dependencies = [
sources."fs-extra-10.1.0"
];
})
(sources."@alcalzone/pak-0.9.0" // {
dependencies = [
sources."execa-5.0.1"
sources."fs-extra-10.1.0"
];
})
sources."@alcalzone/proper-lockfile-4.1.3-0"
sources."@colors/colors-1.6.0"
sources."@dabh/diagnostics-2.0.3"
sources."@homebridge/ciao-1.1.7"
sources."@leichtgewicht/ip-codec-2.0.4"
sources."@serialport/binding-mock-10.2.2"
(sources."@serialport/bindings-cpp-12.0.1" // {
dependencies = [
sources."@serialport/parser-delimiter-11.0.0"
sources."@serialport/parser-readline-11.0.0"
sources."node-gyp-build-4.6.0"
];
})
sources."@serialport/bindings-interface-1.2.2"
sources."@serialport/parser-byte-length-12.0.0"
sources."@serialport/parser-cctalk-12.0.0"
sources."@serialport/parser-delimiter-12.0.0"
sources."@serialport/parser-inter-byte-timeout-12.0.0"
sources."@serialport/parser-packet-length-12.0.0"
sources."@serialport/parser-readline-12.0.0"
sources."@serialport/parser-ready-12.0.0"
sources."@serialport/parser-regex-12.0.0"
sources."@serialport/parser-slip-encoder-12.0.0"
sources."@serialport/parser-spacepacket-12.0.0"
sources."@serialport/stream-12.0.0"
sources."@sindresorhus/is-5.6.0"
sources."@szmarczak/http-timer-5.0.1"
sources."@types/http-cache-semantics-4.0.3"
sources."@types/triple-beam-1.3.4"
sources."@zwave-js/cc-12.3.0"
sources."@zwave-js/config-12.3.0"
sources."@zwave-js/core-12.3.0"
sources."@zwave-js/host-12.3.0"
sources."@zwave-js/nvmedit-12.3.0"
sources."@zwave-js/serial-12.3.0"
sources."@zwave-js/shared-12.2.3"
sources."@zwave-js/testing-12.3.0"
sources."alcalzone-shared-4.0.8"
sources."ansi-colors-4.1.3"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."async-3.2.4"
sources."asynckit-0.4.0"
sources."axios-0.27.2"
sources."buffer-from-1.1.2"
sources."bufferutil-4.0.8"
sources."cacheable-lookup-7.0.0"
sources."cacheable-request-10.2.14"
sources."cliui-8.0.1"
(sources."color-3.2.1" // {
dependencies = [
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
];
})
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."color-string-1.9.1"
sources."colorspace-1.1.4"
sources."combined-stream-1.0.8"
sources."cross-spawn-7.0.3"
sources."dayjs-1.11.10"
sources."debug-4.3.4"
(sources."decompress-response-6.0.0" // {
dependencies = [
sources."mimic-response-3.1.0"
];
})
sources."defer-to-connect-2.0.1"
sources."delayed-stream-1.0.0"
sources."dns-packet-5.6.1"
sources."emoji-regex-8.0.0"
sources."enabled-2.0.0"
sources."escalade-3.1.1"
sources."eventemitter3-5.0.1"
sources."execa-5.1.1"
sources."fast-deep-equal-3.1.3"
sources."fecha-4.2.3"
sources."file-stream-rotator-0.6.1"
sources."fn.name-1.1.0"
sources."follow-redirects-1.15.3"
sources."form-data-4.0.0"
sources."form-data-encoder-2.1.4"
sources."fs-extra-11.1.1"
sources."get-caller-file-2.0.5"
sources."get-stream-6.0.1"
sources."globalyzer-0.1.0"
sources."globrex-0.1.2"
sources."got-13.0.0"
sources."graceful-fs-4.2.11"
sources."http-cache-semantics-4.1.1"
sources."http2-wrapper-2.2.0"
sources."human-signals-2.1.0"
sources."inherits-2.0.4"
sources."is-arrayish-0.3.2"
sources."is-fullwidth-code-point-3.0.0"
sources."is-stream-2.0.1"
sources."isexe-2.0.0"
sources."json-buffer-3.0.1"
sources."json-logic-js-2.0.2"
sources."json5-2.2.3"
sources."jsonfile-6.1.0"
sources."keyv-4.5.4"
sources."kuler-2.0.0"
sources."logform-2.6.0"
sources."lowercase-keys-3.0.0"
sources."lru-cache-6.0.0"
sources."mdns-server-1.0.11"
sources."merge-stream-2.0.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."mimic-fn-2.1.0"
sources."mimic-response-4.0.0"
sources."minimist-1.2.8"
sources."moment-2.29.4"
sources."ms-2.1.2"
sources."node-addon-api-7.0.0"
sources."node-gyp-build-4.6.1"
sources."normalize-url-8.0.0"
sources."npm-run-path-4.0.1"
sources."nrf-intel-hex-1.3.0"
sources."object-hash-2.2.0"
sources."one-time-1.0.0"
sources."onetime-5.1.2"
sources."p-cancelable-3.0.0"
sources."p-queue-7.4.1"
sources."p-timeout-5.1.0"
sources."path-key-3.1.1"
sources."proper-lockfile-4.1.2"
sources."quick-lru-5.1.1"
sources."readable-stream-3.6.2"
sources."reflect-metadata-0.1.13"
sources."require-directory-2.1.1"
sources."resolve-alpn-1.2.1"
sources."responselike-3.0.0"
sources."retry-0.12.0"
sources."safe-buffer-5.2.1"
sources."safe-stable-stringify-2.4.3"
sources."semver-7.5.4"
sources."serialport-12.0.0"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.7"
sources."simple-swizzle-0.2.2"
sources."source-map-0.6.1"
sources."source-map-support-0.5.21"
sources."stack-trace-0.0.10"
sources."string-width-4.2.3"
sources."string_decoder-1.3.0"
sources."strip-ansi-6.0.1"
sources."strip-final-newline-2.0.0"
sources."text-hex-1.0.0"
sources."tiny-glob-0.2.9"
sources."triple-beam-1.4.1"
sources."tslib-2.6.2"
sources."universalify-2.0.1"
sources."utf-8-validate-6.0.3"
sources."util-deprecate-1.0.2"
sources."which-2.0.2"
sources."winston-3.11.0"
sources."winston-daily-rotate-file-4.7.1"
sources."winston-transport-4.6.0"
sources."wrap-ansi-7.0.0"
sources."ws-8.14.2"
sources."xstate-4.38.2"
sources."y18n-5.0.8"
sources."yallist-4.0.0"
sources."yargs-17.7.2"
sources."yargs-parser-21.1.1"
sources."zwave-js-12.3.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Full access to zwave-js driver through Websockets";
homepage = "https://github.com/zwave-js/zwave-js-server#readme";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "alexapy";
version = "1.27.7";
version = "1.27.8";
pyproject = true;
disabled = pythonOlder "3.10";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "keatontaylor";
repo = "alexapy";
rev = "refs/tags/v${version}";
hash = "sha256-8OktaoH15FmwWEpUS+3yv6Q7fwfTf144yvaldAp7CQU=";
hash = "sha256-M6cv1l6UpUJ0Wn7Swa7Cv+XsDNbzHLNrTJjU5ePL83Q=";
};
pythonRelaxDeps = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "blinkpy";
version = "0.22.2";
version = "0.22.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "fronzbot";
repo = "blinkpy";
rev = "refs/tags/v${version}";
hash = "sha256-T6ryiWVpraaXzwHYBXjuIO8PUqUcQBcLi1+O+iNBaoc=";
hash = "sha256-J9eBZv/uizkZz53IX1ZfF7IeMOnBonyMD2c5DphW8BQ=";
};
postPatch = ''

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "dask-histogram";
version = "2023.6.0";
version = "2023.10.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "dask-contrib";
repo = "dask-histogram";
rev = "refs/tags/${version}";
hash = "sha256-9b2+vrUH8lZYsEbJg+GmY5zHZ+7PyA9NV2h5VAN0J1s=";
hash = "sha256-ugAqNdvCROCCXURwsGLpnl/lBEAremvTI7MVa/TWt6c=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
, pygments
, pytestCheckHook
, pythonOlder
, restructuredtext_lint
, restructuredtext-lint
, setuptools-scm
, stevedore
, wheel
@ -48,7 +48,7 @@ buildPythonPackage rec {
docutils
chardet
stevedore
restructuredtext_lint
restructuredtext-lint
pygments
];

View file

@ -6,7 +6,7 @@
, pyparsing
, graphviz
, pytestCheckHook
, texlive
, texliveSmall
}:
buildPythonPackage rec {
@ -36,9 +36,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
(texlive.combine {
inherit (texlive) scheme-small preview pstricks;
})
(texliveSmall.withPackages (ps: with ps; [ preview pstricks ]))
];
meta = with lib; {

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "easydict";
version = "1.10";
version = "1.11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8=";
hash = "sha256-3LHS7SjrMAyORs03E0A3Orxi98FNbep0/fxvEGkGHHg=";
};
doCheck = false; # No tests in archive

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "evohome-async";
version = "0.4.3";
version = "0.4.4";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "zxdavb";
repo = "evohome-async";
rev = "refs/tags/${version}";
hash = "sha256-GDrDOwB/cgry3eRNx8IMiBoLu5xLTnG5ByuuwnWA7DY=";
hash = "sha256-IXI1Aot0M6VKyiiuyjR+P0WufZO4MMDemC48/kMhvTY=";
};
nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "ezyrb";
version = "1.3.0.post2309";
version = "1.3.0.post2311";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "mathLab";
repo = "EZyRB";
rev = "refs/tags/v${version}";
hash = "sha256-9g7FCyGZc9TDR9MummM1KJJZs31Oo50N/U6HjKM90Nw=";
hash = "sha256-qIH/cn+QdcjfNwvokbkC+euo6RD75DrqJ5Oj6Ji/9cY=";
};
propagatedBuildInputs = [

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "faster-whisper";
version = "0.8.0";
version = "0.9.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "guillaumekln";
repo = "faster-whisper";
rev = "refs/tags/v${version}";
hash = "sha256-MVcopBIwmgoklVROfIp35uvFgNQDVDNDfJwITV9sLSQ=";
hash = "sha256-kHXX5Z4r7+lFRBtTCsPy9DILwsk3T1mcBzmJnCrKTdk=";
};
postPatch = ''

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "fasttext-predict";
version = "0.9.2.1";
version = "0.9.2.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-iSCt54tqBmNfrcntDFRXb550607Zr1mMCO2PC1ZbVQw=";
hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc=";
};
nativeBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "finvizfinance";
version = "0.14.6";
version = "0.14.7";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "lit26";
repo = "finvizfinance";
rev = "refs/tags/v${version}";
hash = "sha256-YRdOj0n2AUGRicQCENoXWad5MnRyTqQFxqisTFnClac=";
hash = "sha256-ht1bez04MAgugsQqa47q2ED7z8xpiXmzkOYBR7/PZHU=";
};
postPatch = ''

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "flask-paginate";
version = "2023.10.8";
version = "2023.10.24";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "lixxu";
repo = "flask-paginate";
rev = "refs/tags/v${version}";
hash = "sha256-QXXuXwMY3CwSv1P5zDK6q/LZfh96/BL3fbdbg53BJ6o=";
hash = "sha256-9633YLHMF9S1DLK7ZS4qmCOzslXdHLSgpKoJFNvkXlA=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gios";
version = "3.2.0";
version = "3.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-mgfeaYC9Uq23fDzVwHMryYrmDO2b/rSwrvAp/T4HaIE=";
hash = "sha256-ACWaYXAxLpqfjPG7KngFrErbMKo9iSsW2Yi8V0q9Ie0=";
};
propagatedBuildInputs = [

View file

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "glcontext";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TGkVDZbxxvOOal+rLHeCNUoyOzvg9wQsAMan8LDn938=";
hash = "sha256-ld+INKIGDZA2Y+sTxDPY7MI1nru6x+FeixngaJQzKkg=";
};
disabled = !isPy3k;

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "gocardless-pro";
version = "1.47.0";
version = "1.48.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "gocardless";
repo = "gocardless-pro-python";
rev = "refs/tags/v${version}";
hash = "sha256-YCHI4MvdTlpDavXTTU4AESBUOBKt23IPxvGI+BGo2EI=";
hash = "sha256-9229lwCtVu4Pfru6e9JdbP3KUUYojBLuNQ+volP6OX0=";
};
propagatedBuildInputs = [

View file

@ -1,22 +1,35 @@
{ lib, fetchPypi, buildPythonPackage
{ lib, fetchPypi, fetchpatch, buildPythonPackage
, pkg-config
, libgphoto2 }:
, libgphoto2
, setuptools
, toml
}:
buildPythonPackage rec {
pname = "gphoto2";
version = "2.5.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-l9B6PEIGf8rkUlYApOytW2s9OhgcxMHVlDgfQR5ZnoA=";
};
nativeBuildInputs = [ pkg-config ];
# only convert first 2 values from setuptools_version to ints to avoid
# parse errors if last value is a string.
patches = fetchpatch {
url = "https://github.com/jim-easterbrook/python-gphoto2/commit/d388971b63fea831eb986d2212d4828c6c553235.patch";
hash = "sha256-EXtXlhBx2jCKtMl7HmN87liqiHVAFSeXr11y830AlpY=";
};
nativeBuildInputs = [ pkg-config setuptools toml ];
buildInputs = [ libgphoto2 ];
doCheck = false; # No tests available
pythonImportsCheck = [ "gphoto2" ];
meta = with lib; {
description = "Python interface to libgphoto2";
homepage = "https://github.com/jim-easterbrook/python-gphoto2";

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "gptcache";
version = "0.1.41";
version = "0.1.42";
format = "setuptools";
disabled = pythonOlder "3.8.1";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "zilliztech";
repo = "GPTCache";
rev = "refs/tags/${version}";
hash = "sha256-0jQziywoDQQuNaB1G7YovX7473PfI7u5fTRQMidf3NA=";
hash = "sha256-rrPs5ZwBooltVcvrs4AHObx69xmZ8F+IP/lJGPVTNXY=";
};
propagatedBuildInputs = [

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "greeneye-monitor";
version = "5.0";
version = "5.0.1";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jkeljo";
repo = "greeneye-monitor";
rev = "refs/tags/v${version}";
hash = "sha256-HU+GWO08caKfQZ0tIDmJYAML4CKUM0CPukm7wD6uSEA=";
hash = "sha256-zNGizNOuZuPRdz82y8IaVvwrTos4lZSqTP5FwOlnRao=";
};
nativeBuildInputs = [

View file

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "httpx-socks";
version = "0.7.8";
version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "romis2012";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-I00+yB+aRnIMUQIJ7Lvr6LsHpf+gibkHh+2XgpeQn5U=";
hash = "sha256-3Dj+rrH5Pil5xQE6sAAD5RTycwlKq+TVsAeB2NVqGjY=";
};
nativeBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "intellifire4py";
version = "3.1.29";
version = "3.1.30";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "jeeftor";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-isAVq45UnKB8uMg7bhehpxIk5OOLcWx+VNZhJ8dE52Y=";
hash = "sha256-CIcudKyRPVJX6QvWk6dBbYnO5EULREDhaflJTAfJEvc=";
};
nativeBuildInputs = [

View file

@ -16,16 +16,16 @@
buildPythonPackage rec {
pname = "jaxopt";
version = "0.8.1";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "google";
repo = pname;
repo = "jaxopt";
rev = "refs/tags/jaxopt-v${version}";
hash = "sha256-5+GfRFzXyc1Ukp86NeK0qstTq9fkx+eDb4iXvxzRoKs=";
hash = "sha256-uVOd3knoku5fKBNXOhCikGtjDuW3TtRqev94OM/8Pgk=";
};
propagatedBuildInputs = [

View file

@ -1,38 +1,50 @@
{ lib
, buildPythonPackage
, dill
, fetchFromGitHub
, hatchling
, dill
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "latexify-py";
version = "0.2.0";
version = "0.3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "google";
repo = "latexify_py";
rev = "refs/tags/v${version}";
hash = "sha256-b0/cKMfIONVd6A5AYRyLx/qsFVpUjeAsadQyu/mPYxo=";
hash = "sha256-uWSLs7Dem+cj93RWIincCXzPkjZUwQskpDac/L+fgjQ=";
};
nativeBuildInputs = [ hatchling ];
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [ dill ];
propagatedBuildInputs = [
dill
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"latexify"
];
preCheck = ''
cd src
'';
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "latexify" ];
meta = with lib; {
description = "Generates LaTeX math description from Python functions";
homepage = "https://github.com/google/latexify_py";
changelog = "https://github.com/google/latexify_py/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ prusnak ];
};

View file

@ -8,7 +8,7 @@
, tiktoken
}:
let
version = "0.1.738";
version = "0.11.1";
in
buildPythonPackage rec {
pname = "litellm";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "BerriAI";
repo = "litellm";
rev = "refs/tags/v${version}";
hash = "sha256-1Ft2E5I3OkVZUfmQHN1Qe/Z3cvLid8ie3BCeZoAii8U=";
hash = "sha256-5Zk1lc7G0dU/AoLE5V+p30wE/gRfYRPsVS3sNgwWzCU=";
};
postPatch = ''

View file

@ -3,23 +3,28 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
, setuptools
}:
let
pname = "lru-dict";
version = "1.2.0";
version = "1.3.0";
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-E8VngvGdaN302NsBcAQRkoWWFlFMcGsSbQ3y7HKhG9c=";
hash = "sha256-VP0ZZta9H83ngVlsuGBoIU7e6/8dsTos6hEHnj/Qe2s=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "lsassy";
version = "3.1.8";
version = "3.1.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Hackndo";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-refOq/QWRv1naCskVm6h1QmCH9/YkDJ90HU3Hzc2w4A=";
hash = "sha256-VGLSVv/+UpgeSTHoOTjEfQSAYfXA3bAI+yKjcKBI1Z4=";
};
propagatedBuildInputs = [

View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "2.2.11";
version = "2.2.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
hash = "sha256-8iR1OWFtgS15eezRacz6NjZTHXKCvn+4NpfnCfSHOV8=";
hash = "sha256-W//mDKtTWjcKT43n82OU3h4yKrNZMAVzLzQCjsmkJP0=";
};
propagatedBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "nextdns";
version = "2.0.0";
version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.10";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bieniu";
repo = "nextdns";
rev = "refs/tags/${version}";
hash = "sha256-AgxBJXPBYkJR8W8tGKcHJaAP52guNVvm190ZlZ9BhA4=";
hash = "sha256-NJjnk/FadD4QUqPYxbbS7gsIKVxwR5tpnBth1HFLkr0=";
};
propagatedBuildInputs = [

View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.34.4";
version = "0.34.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
hash = "sha256-lyQE3+ZRZgKTZiv6p+cLZRe26M9BnM59fvLjWwFiE8E=";
hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0=";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "0.10.0.20231104";
version = "0.10.0.20231105";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-p+sOaRfp2IDdXL6eotCrSHu91i+mAwavmqELa5nDB7c=";
hash = "sha256-+/r2gVtA0j+aY827B0wZCOlogil7921V94/bay8/dVg=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pycep-parser";
version = "0.4.1";
version = "0.4.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gruebel";
repo = "pycep";
rev = "refs/tags/${version}";
hash = "sha256-OSdxdhGAZhl625VdIDHQ1aepQR5B0pCTLavfxer1tqc=";
hash = "sha256-qogUjj/GwMGwFEin+xJCSOCf5Ut8bgsFakyoMhkyKgU=";
};
nativeBuildInputs = [

View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyoverkiz";
version = "1.12.1";
version = "1.12.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
hash = "sha256-PmdCFeKk2Lz9sKDKcRqNkItpASIaFs9hvGvA1gE1c0E=";
hash = "sha256-TmdiUca87ViuBHB3ZvD3kv1VjKSmYx1G78Uowf3/w5Q=";
};
postPatch = ''

View file

@ -6,7 +6,7 @@
, poetry-core
, pythonOlder
, substituteAll
, texlive
, texliveSmall
}:
buildPythonPackage rec {
@ -37,7 +37,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
texlive.combined.scheme-small
texliveSmall
pandocfilters
];

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysml";
version = "0.1.0";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "mtdcr";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-m1dh607hFqcd4CXWiMfGDmI5s8A0UkdyPzq/V+5OUto=";
hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4=";
};
nativeBuildInputs = [

View file

@ -6,7 +6,7 @@
, python-dateutil
, x-wr-timezone
, pytestCheckHook
, restructuredtext_lint
, restructuredtext-lint
, pygments
, tzdata
}:
@ -33,7 +33,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
restructuredtext_lint
restructuredtext-lint
pygments
tzdata
];

View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, docutils
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "restructuredtext-lint";
version = "1.4.0";
pyproject = true;
src = fetchPypi {
pname = "restructuredtext_lint";
inherit version;
hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [ docutils ];
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"restructuredtext_lint/test/test.py"
];
pythonImportsCheck = [
"restructuredtext_lint"
];
meta = {
description = "reStructuredText linter";
homepage = "https://github.com/twolfson/restructuredtext-lint";
changelog = "https://github.com/twolfson/restructuredtext-lint/blob/${version}/CHANGELOG.rst";
license = lib.licenses.unlicense;
mainProgram = "rst-lint";
};
}

View file

@ -1,30 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, docutils
, nose
, testtools
}:
buildPythonPackage rec {
pname = "restructuredtext_lint";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU=";
};
nativeCheckInputs = [ nose testtools ];
propagatedBuildInputs = [ docutils ];
checkPhase = ''
nosetests --nocapture
'';
meta = {
description = "reStructuredText linter";
homepage = "https://github.com/twolfson/restructuredtext-lint";
license = lib.licenses.unlicense;
};
}

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.6.5";
version = "0.6.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-Ro8glYHzekuk85DQgRwvrmhbez37EEIiLSMrN5AziB8=";
hash = "sha256-GKvtplzvSHCsSA4KJvtltzDy/gKpeFx05Ib1j69c09g=";
};
propagatedBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "roonapi";
version = "0.1.4";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pavoni";
repo = "pyroon";
rev = version;
hash = "sha256-TXIKa5DB5+511fQuHAQwPWqw7vQPP+s1X3U7BgEfzzE=";
hash = "sha256-356eSRlO0kIaOm+O4bApraC0amEprBcCSvzl3LQ7k/E=";
};
nativeBuildInputs = [

View file

@ -5,7 +5,7 @@
, withCryptography ? true, cryptography
, withVoipSupport ? true, sox
, withPlottingSupport ? true, matplotlib
, withGraphicsSupport ? false, pyx, texlive, graphviz, imagemagick
, withGraphicsSupport ? false, pyx, texliveBasic, graphviz, imagemagick
, withManufDb ? false, wireshark
, libpcap
# 2D/3D graphics and graphs TODO: VPython
@ -48,7 +48,7 @@ buildPythonPackage rec {
++ lib.optional withCryptography cryptography
++ lib.optional withVoipSupport sox
++ lib.optional withPlottingSupport matplotlib
++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-basic graphviz imagemagick ];
++ lib.optionals withGraphicsSupport [ pyx texliveBasic graphviz imagemagick ];
# Running the tests seems too complicated:
doCheck = false;

View file

@ -4,16 +4,16 @@
, buildPythonPackage
, cryptography
, fetchFromGitHub
, flit-core
, lxml
, pyjwt
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "skodaconnect";
version = "1.3.7";
format = "setuptools";
version = "1.3.8";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,13 +21,17 @@ buildPythonPackage rec {
owner = "lendy007";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8=";
hash = "sha256-Isnji6hXkTuTmbMpSuim9uG5ECSDX6A8QZ13sTCU9t0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
postPatch = ''
# https://github.com/skodaconnect/skodaconnect/pull/103
substituteInPlace pyproject.toml \
--replace "Bug Tracker" '"Bug Tracker"'
'';
nativeBuildInputs = [
setuptools-scm
flit-core
];
propagatedBuildInputs = [
@ -38,13 +42,6 @@ buildPythonPackage rec {
pyjwt
];
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest>=5,<6'," ""
substituteInPlace requirements.txt \
--replace "pytest-asyncio" ""
'';
# Project has no tests
doCheck = false;

View file

@ -3,7 +3,7 @@
, fetchPypi
, sphinx
, pdf2svg
, texLive
, texliveSmall
}:
buildPythonPackage rec {
@ -17,7 +17,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace sphinxcontrib/tikz.py \
--replace "config.latex_engine" "'${texLive}/bin/pdflatex'" \
--replace "config.latex_engine" "'${texliveSmall.withPackages (ps: with ps; [ standalone pgfplots ])}/bin/pdflatex'" \
--replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'"
'';

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "tldextract";
version = "5.0.1";
version = "5.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "john-kurkowski";
repo = "tldextract";
rev = "refs/tags/${version}";
hash = "sha256-+JZnSIjG1avQ14NxbYF5on2ukJtTWTq+hVIqYCvPjsQ=";
hash = "sha256-x5SJcbTUrqG7mMUPXIhR1rEu3PZ+VA00dFYeoGnX5l0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tplink-omada-client";
version = "1.3.5";
version = "1.3.6";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "tplink_omada_client";
inherit version;
hash = "sha256-tCyYaYJIkuJBGgE3xxc/jMir1mc7UDRXZ3i1Ai1/mxs=";
hash = "sha256-8NP+5qBdWiBUPf5DJWMrHJfZwpRNkCewjrjTbvgD3AA=";
};
nativeBuildInputs = [

Some files were not shown because too many files have changed in this diff Show more