diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1f205747dccb..ffaa68bd7bfe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14795,7 +14795,7 @@ name = "Christoph Honal"; }; star-szr = { - email = "nixpkgs@scottr.mailworks.org"; + email = "nixpkgs@szr.fastmail.com"; github = "star-szr"; githubId = 327943; name = "Scott Zhu Reeves"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index bc485832fab6..09af5ef988c1 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -389,6 +389,8 @@ In addition to numerous new and upgraded packages, this release has the followin } ``` +- `services.netdata` offers a `deadlineBeforeStopSec` option which enable users who have netdata instance that takes time to initialize to not have systemd kill them for no reason. + - `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses. If network uses both IPv6 Unique local addresses (ULA) and global IPv6 address auto-configuration with SLAAC, must add the parameter `networking.dhcpcd.IPv6rs = true;`. diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 92c870bb23f1..bd0dea83e1a8 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -169,6 +169,20 @@ in { See: ''; }; + + deadlineBeforeStopSec = mkOption { + type = types.int; + default = 120; + description = lib.mdDoc '' + In order to detect when netdata is misbehaving, we run a concurrent task pinging netdata (wait-for-netdata-up) + in the systemd unit. + + If after a while, this task does not succeed, we stop the unit and mark it as failed. + + You can control this deadline in seconds with this option, it's useful to bump it + if you have (1) a lot of data (2) doing upgrades (3) have low IOPS/throughput. + ''; + }; }; }; @@ -205,7 +219,7 @@ in { while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done ''; - TimeoutStopSec = 60; + TimeoutStopSec = cfg.deadlineBeforeStopSec; Restart = "on-failure"; # User and group User = cfg.user; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 0141dc32d28e..67c02e299e19 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "22.11.1"; + version = "23.4.2"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-cZZFc1Ij7KrF0Kc1Xmtg/73ASv56a6SFWFy3Miwl3P5u8ieZGXVDlSQyv84CsuYMbE0Vga3X0XS/BiF7nKNcnA=="; - x86_64-linux = "sha512-X/IEZGs43riUn6vC5bPyj4DS/VK+s7C10PbBnvwieaclBSVJyQ8H8hbn4eKi0kMVNEl0A9o8W09gXBxAhdNR9g=="; + aarch64-linux = "sha512-+dcogzj0mENWSAVKqUG/xyF+TD/nKpA3UiNyI2M7iiCaW+tpwO5Y0uUmzb1rFRtDsKMflDPZNWe8qMJmrtaIrA=="; + x86_64-linux = "sha512-8UyPa3hDmALiYGao451ZBQLxv9H9OLbzzHiANp4zgvjBLGNhZnPFBIYM6KGyKkgRJJiTcgd7VHCgEhPpfm0qzg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 4dc186c5f843..6f228e26a05c 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -1,73 +1,67 @@ { stdenv , lib , fetchFromGitLab - , gettext , meson , ninja , pkg-config -, python3 , rustPlatform , wrapGAppsHook4 - , appstream-glib , desktop-file-utils , glib , gtk4 +, gdk-pixbuf , libadwaita , Foundation }: stdenv.mkDerivation rec { pname = "gnome-obfuscate"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; rev = version; - sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8="; + hash = "sha256-aUhzact437V/bSsG2Ddu2mC03LbyXFg+hJiuGy5NQfQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE="; + hash = "sha256-HUQvdCmzjdmuJGDLtC/86yzbRimLzx+XbW29f+Ua48w="; }; nativeBuildInputs = [ gettext - glib meson ninja pkg-config - python3 rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc wrapGAppsHook4 + appstream-glib + desktop-file-utils ]; buildInputs = [ - appstream-glib - desktop-file-utils glib gtk4 + gdk-pixbuf libadwaita ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; - meta = with lib; { description = "Censor private information"; homepage = "https://gitlab.gnome.org/World/obfuscate"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "obfuscate"; + maintainers = with maintainers; [ fgaz ]; }; } diff --git a/pkgs/applications/kde/analitza.nix b/pkgs/applications/kde/analitza.nix new file mode 100644 index 000000000000..2ddd8cfbb821 --- /dev/null +++ b/pkgs/applications/kde/analitza.nix @@ -0,0 +1,34 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, qtbase +, qtsvg +, eigen +, kdoctools +, qttools +}: + +mkDerivation { + pname = "analitza"; + + nativeBuildInputs = [ + cmake + eigen + extra-cmake-modules + kdoctools + qttools + ]; + + buildInputs = [ + qtbase + qtsvg + ]; + + meta = with lib; { + description = "Front end to powerful mathematics and statistics packages"; + homepage = "https://cantor.kde.org/"; + license = with licenses; [ gpl2Only lgpl2Only fdl12Only ]; + maintainers = with maintainers; [ hqurve ]; + }; +} diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix new file mode 100644 index 000000000000..1c9a9f718a76 --- /dev/null +++ b/pkgs/applications/kde/cantor.nix @@ -0,0 +1,109 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules +, makeWrapper +, shared-mime-info + +, qtbase +, qtsvg +, qttools +, qtwebengine +, qtxmlpatterns + +, poppler + +, karchive +, kcompletion +, kconfig +, kcoreaddons +, kcrash +, kdoctools +, ki18n +, kiconthemes +, kio +, knewstuff +, kparts +, kpty +, ktexteditor +, ktextwidgets +, kxmlgui +, syntax-highlighting + +, libspectre + +# Backends. Set to null if you want to omit from the build +, withAnalitza ? true, analitza +, wtihJulia ? true, julia +, withQalculate ? true, libqalculate +, withLua ? true, luajit +, withPython ? true, python3 +, withR ? true, R +, withSage ? true, sage, sage-with-env ? sage.with-env +}: + +mkDerivation { + pname = "cantor"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + makeWrapper + shared-mime-info + qttools + ]; + + buildInputs = [ + qtbase + qtsvg + qtwebengine + qtxmlpatterns + + poppler + + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + kpty + ktexteditor + ktextwidgets + kxmlgui + syntax-highlighting + + libspectre + ] + # backends + ++ lib.optional withAnalitza analitza + ++ lib.optional wtihJulia julia + ++ lib.optional withQalculate libqalculate + ++ lib.optional withLua luajit + ++ lib.optional withPython python3 + ++ lib.optional withR R + ++ lib.optional withSage sage-with-env + ; + + qtWrapperArgs = [ + "--prefix PATH : ${placeholder "out"}/bin" + ]; + + postInstall = lib.optionalString withSage '' + wrapProgram $out/share/cantor/sagebackend/cantor-execsage \ + --prefix PATH : ${sage-with-env}/bin + ''; + + meta = with lib; { + description = "Front end to powerful mathematics and statistics packages"; + homepage = "https://cantor.kde.org/"; + license = with licenses; [ bsd3 cc0 gpl2Only gpl2Plus gpl3Only ]; + maintainers = with maintainers; [ hqurve ]; + }; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 3e3f31c3a70b..f6988f9831df 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -72,12 +72,14 @@ let akonadi-search = callPackage ./akonadi-search.nix {}; akonadiconsole = callPackage ./akonadiconsole.nix {}; akregator = callPackage ./akregator.nix {}; + analitza = callPackage ./analitza.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; bomber = callPackage ./bomber.nix {}; bovo = callPackage ./bovo.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; colord-kde = callPackage ./colord-kde.nix {}; + cantor = callPackage ./cantor.nix {}; dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dragon = callPackage ./dragon.nix {}; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 70b85169b79c..86c66a53373f 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -110,12 +110,14 @@ in stdenv.mkDerivation { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done + ln -s $out/share/1password/op-ssh-sign $out/bin/op-ssh-sign + runHook postInstall ''; diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix index b4a6bfac6c47..3fa071264088 100644 --- a/pkgs/applications/misc/conceal/default.nix +++ b/pkgs/applications/misc/conceal/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "conceal"; @@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; maintainers = with maintainers; [ jedsek ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 884532eb398d..6562cd7b4a29 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff -, wayland, plasma-workspace }: +, wayland, plasma-workspace, plasma-desktop }: mkDerivation rec { pname = "latte-dock"; @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "sha256-oEfKfsVIAmYgQ7+WyBEQfVpI4IndWhYXWBsJE8bNNyI="; }; - buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace ]; + buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace plasma-desktop ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem qtx11extras kcrash knewstuff ]; diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix new file mode 100644 index 000000000000..11309392259d --- /dev/null +++ b/pkgs/applications/science/math/labplot/default.nix @@ -0,0 +1,106 @@ +{ lib +, stdenv +, fetchurl +, cmake +, extra-cmake-modules +, shared-mime-info +, wrapQtAppsHook + +, qtbase + +, karchive +, kcompletion +, kconfig +, kcoreaddons +, kcrash +, kdoctools +, ki18n +, kiconthemes +, kio +, knewstuff +, kparts +, ktextwidgets +, kxmlgui +, syntax-highlighting + +, gsl + +, poppler +, fftw +, hdf5 +, netcdf +, cfitsio +, libcerf +, cantor +, zlib +, lz4 +, readstat +, matio +, qtserialport +, discount +}: + +stdenv.mkDerivation rec { + pname = "labplot"; + version = "2.10.0"; + + src = fetchurl { + url = "https://download.kde.org/stable/labplot/labplot-${version}.tar.xz"; + sha256 = "sha256-XfxnQxCQSkOHXWnj4mCh/t2WjmwbHs2rp1WrGqOMupA="; + }; + + cmakeFlags = [ + # Disable Vector BLF since it depends on DBC parser which fails to be detected + "-DENABLE_VECTOR_BLF=OFF" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + shared-mime-info + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + ktextwidgets + kxmlgui + + syntax-highlighting + gsl + + poppler + fftw + hdf5 + netcdf + cfitsio + libcerf + cantor + zlib + lz4 + readstat + matio + qtserialport + discount + ]; + + meta = with lib; { + description = "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone"; + homepage = "https://labplot.kde.org"; + license = with licenses; [ asl20 bsd3 cc-by-30 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus mit ]; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 73776a74cdf9..01184387b4e9 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m doc = sagedoc; lib = sage-with-env.env.lib; + with-env = sage-with-env; kernelspec = jupyter-kernel-definition; }; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index d9be42c2b64f..6a720026b3ce 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -3,7 +3,7 @@ let # To control nodejs version we pass down - nodejs = pkgs.nodejs_16; + nodejs = pkgs.nodejs_18; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index 8e57316f7c89..53589394c4aa 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "mdutils"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "didix21"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/J5c0ndpm+Zy8QV6MqlMGkoh6fX5gBgfc0NvYowsdEo="; + hash = "sha256-xF6z63CjL/qSBQsm/fSTQhwpg9yJU4qrY06cjn1PbCk="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 8e84896079c1..34980fb0c1ad 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -8,6 +8,7 @@ , click , colorama , configparser +, dominate , fetchFromGitHub , filetype , habanero @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "papis"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "papis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WKsU/5LXqXiFpWyTZGpvZn4lyANPosbvuhYH3opbBRs="; + hash = "sha256-iRrf37hq+9D01JRaQIqg7yTPbLX6I0ZGnzG3r1DX464="; }; propagatedBuildInputs = [ @@ -51,6 +52,7 @@ buildPythonPackage rec { click colorama configparser + dominate filetype habanero isbnlib @@ -69,14 +71,11 @@ buildPythonPackage rec { ]; postPatch = '' - # Remove when https://github.com/papis/papis/pull/478 lands in upstream - substituteInPlace setup.py \ - --replace "etc/bash_completion.d/" "share/bash-completion/completions/" substituteInPlace setup.cfg \ --replace "--cov=papis" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -90,6 +89,7 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/downloaders" + "papis/downloaders/usenix.py" ]; disabledTests = [ @@ -98,7 +98,9 @@ buildPythonPackage rec { "test_doi_to_data" "test_downloader_getter" "test_general" + "test_get_config_dirs" "test_get_data" + "test_valid_dblp_key" "test_validate_arxivid" "test_yaml" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index e568568ccdeb..39cee0f68d18 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-vUvDdeowbrmDQvUCUYRjOGQQrlyGGKrnXsYFsMWMfFw="; + sha256 = "sha256-u07HuWKtZUvK66Do9GFnFRQUwyxfNdtVvNZ+aLDmBrE="; }; - cargoHash = "sha256-zb1F3bv1MrXkoBzTaVXbHcKFlg5R9Ulq6eN8mh8WKSg="; + cargoHash = "sha256-KpK4yfvYhxqVGq2JB2SRtIQ6MQQhjXEYSIzi0SZgvY4="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 27f75537e1d0..b6d7d4bc15d7 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.55.0"; + version = "1.55.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-6Jq9Tc3NVZcvP5Pdy9Bx9yX/pdS3I2X9n1mPirBckB8="; + sha256 = "sha256-bgbQw59AxroHMJJI8YQq38tyv/uvv513ekXzG7MVEP0="; }; - vendorSha256 = "sha256-Kqb5Rici4J4psPx1Yfp3mGnwuXlzEreQvm4yFcWCp8U="; + vendorSha256 = "sha256-FYQbMnBtHlW0jdIyVkmbf+b3VETfcwGhGM0yYkNMGH4="; ldflags = [ "-s" diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix index ea69ecd7513c..809010be2a72 100644 --- a/pkgs/os-specific/linux/dddvb/default.nix +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; + broken = lib.versionAtLeast kernel.version "6.2"; }; } diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 7cd15f194cc0..eb5a795c933b 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-02-24"; + version = "${kernel.version}-unstable-2023-03-17"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "51a2fb94893c562ec5f2fabce0b80e4da4eda812"; - sha256 = "sha256-nTas2EkghZeQhc8bTtoQfHEl8QJtClXi9V1IxlIThbI="; + rev = "f0a2c9c74045cf2c3701084f389e358f9236fc8c"; + sha256 = "sha256-hquLmEOzdBQ6rJld5kkzVw+hXBFb/ZwpBI0eL0rUrkM="; }; hardeningDisable = [ "pic" ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.ralith ]; + maintainers = with maintainers; [ otavio ralith ]; }; } diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 999fe57b5044..f9371bd916fb 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -70,6 +70,8 @@ beamPackages.mixRelease { meta = with lib; { license = licenses.agpl3Plus; + # broken since the deprecation of nodejs_16 + broken = true; homepage = "https://plausible.io/"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics."; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/tools/games/ukmm/Cargo.lock index 1089feeb47ba..ce5211be3a8b 100644 --- a/pkgs/tools/games/ukmm/Cargo.lock +++ b/pkgs/tools/games/ukmm/Cargo.lock @@ -3105,6 +3105,48 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + [[package]] name = "pico-args" version = "0.4.2" @@ -3621,6 +3663,8 @@ checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9" dependencies = [ "crc 2.1.0", "include-flate", + "phf", + "roead", "serde", "serde_json", "thiserror", @@ -4736,7 +4780,7 @@ dependencies = [ [[package]] name = "ukmm" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "anyhow_ext", diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index c300b4df1a36..5e53f5003f5e 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "ukmm"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YgM1qb4/wng9A6lAjg2z1oev+dE90o+39TTeIN5Sepw="; + hash = "sha256-gZ9r+al6WsxwMEBoRPNAkBpZP5CdJkrxEEzSxH+0GdI="; }; cargoLock = { diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix new file mode 100644 index 000000000000..7011c6b5a30a --- /dev/null +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, cli11 +, openssl +, zeromq +, cppzmq +, tbb_2021_8 +, spdlog +, libsodium +, fmt +, vips +, nlohmann_json +, libsixel +, opencv +, xorg +, withOpencv ? true +, withX11 ? true +}: + + +stdenv.mkDerivation rec { + pname = "ueberzugpp"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "jstkdng"; + repo = "ueberzugpp"; + rev = "v${version}"; + hash = "sha256-PTI+jIsXq4yh8TBAT1p1CLbBMDW1U323WgPoASz2pwA="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + cli11 + ]; + + buildInputs = [ + openssl + zeromq + cppzmq + tbb_2021_8 + spdlog + libsodium + fmt + vips + nlohmann_json + libsixel + ] ++ lib.optionals withOpencv [ + opencv + ] ++ lib.optionals withX11 [ + xorg.libX11 + xorg.xcbutilimage + ]; + + cmakeFlags = lib.optionals (!withOpencv) [ + "-DENABLE_OPENCV=OFF" + ] ++ lib.optionals (!withX11) [ + "-DENABLE_X11=OFF" + ]; + + meta = with lib; { + description = "Drop in replacement for ueberzug written in C++"; + homepage = "https://github.com/jstkdng/ueberzugpp"; + license = licenses.gpl3Plus; + mainProgram = "ueberzug"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/tools/misc/findup/default.nix index 0b7d687922f4..44a9d505ce88 100644 --- a/pkgs/tools/misc/findup/default.nix +++ b/pkgs/tools/misc/findup/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "findup"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hiljusti"; repo = pname; rev = "v${version}"; - sha256 = "sha256-erlKIiYYlWnhoeD3FnKdxnHjfGmmJVXk44DUja5Unig="; + sha256 = "sha256-fafMBC/ibCHgC3JwCNEh74Qw/yZ+KQF//z1e+OpeGus="; }; nativeBuildInputs = [ zig ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b4d012b24deb..00c3449accca 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests , netdata-go-plugins -, bash, curl, jemalloc, libuv, zlib +, bash, curl, jemalloc, libuv, zlib, libyaml , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups , withDBengine ? true, lz4 @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.38.1"; + version = "1.39.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-y+rjqS95JS1PU+iR8c7spcg1UoYCjpzbpunTAgTJ35U="; + sha256 = "sha256-YegHgyj9X8YDSsEV65v8oSnRDv57oz3PCkLA1vy+LYA="; fetchSubmodules = true; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc libuv zlib ] + buildInputs = [ bash curl jemalloc libuv zlib libyaml ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] ++ lib.optionals withCups [ cups ] diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 44d0063414e2..3a05d3bbf87b 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,5 +1,5 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index a0a972e8f..b4a2a5f53 100644 +index 24e4c3f09..b3c354943 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am @@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d @@ -38,7 +38,7 @@ index 2d5f92a6b..8b11c7502 100644 dist_noinst_DATA = \ diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index 667f1627c..eb6810057 100644 +index ca49c1c02..1b9bcc446 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ @@ -62,7 +62,7 @@ index c8144c137..f8aaa89b6 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index d5eb88468..ab246e77a 100644 +index ea1b6e961..071fdd564 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -75,10 +75,10 @@ index d5eb88468..ab246e77a 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index a88ccab65..bda6ee2b6 100644 +index 13466639d..e7cc7acea 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -19,15 +19,13 @@ include $(top_srcdir)/build/subst.inc +@@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -89,17 +89,21 @@ index a88ccab65..bda6ee2b6 100644 - .install-type \ $(NULL) + libconfigvnodesdir=$(libconfigdir)/vnodes +@@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit + libsyssystemddir=$(libsysdir)/systemd + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(configdir) - - nodist_noinst_DATA = \ + $(INSTALL) -d $(DESTDIR)$(libsysdir) + $(INSTALL) -d $(DESTDIR)$(libsyscrondir) diff --git a/web/Makefile.am b/web/Makefile.am -index ccaccd764..16a2977e5 100644 +index be2c545c3..55f373114 100644 --- a/web/Makefile.am +++ b/web/Makefile.am -@@ -12,7 +12,7 @@ SUBDIRS = \ +@@ -13,7 +13,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl # Explicitly install directories to avoid permission issues due to umask @@ -108,3 +112,6 @@ index ccaccd764..16a2977e5 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ +-- +2.40.1 + diff --git a/pkgs/tools/text/base16384/default.nix b/pkgs/tools/text/base16384/default.nix new file mode 100644 index 000000000000..caa41f061575 --- /dev/null +++ b/pkgs/tools/text/base16384/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "base16384"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "fumiama"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5Dfu88aAVtpNAwHAo+LOxe+jpgDhNdHYkWex42dCK0s="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Encode binary files to printable utf16be"; + homepage = "https://github.com/fumiama/base16384"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f33ccefea76c..1f93516899aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3071,6 +3071,8 @@ with pkgs; base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { }; + base16384 = callPackage ../tools/text/base16384 { }; + bashate = python3Packages.callPackage ../development/tools/bashate { }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; @@ -3625,7 +3627,7 @@ with pkgs; play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs_16; }; + plausible = callPackage ../servers/web-apps/plausible { }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; @@ -7475,9 +7477,7 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { - zig = buildPackages.zig_0_9; - }; + findup = callPackage ../tools/misc/findup { }; fingerprintx = callPackage ../tools/security/fingerprintx { }; @@ -34490,6 +34490,8 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; + ueberzugpp = callPackage ../tools/graphics/ueberzugpp { }; + uefi-run = callPackage ../tools/virtualization/uefi-run { }; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; @@ -37519,6 +37521,8 @@ with pkgs; brial = callPackage ../development/libraries/science/math/brial { }; + cantor = libsForQt5.cantor; + clblas = callPackage ../development/libraries/science/math/clblas { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; @@ -37537,6 +37541,8 @@ with pkgs; jags = callPackage ../applications/science/math/jags { }; + labplot = libsForQt5.callPackage ../applications/science/math/labplot { }; + lapack = callPackage ../build-support/alternatives/lapack { }; lapack-ilp64 = lapack.override { isILP64 = true; };