diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a88cf10f1541..8ee00acc7536 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.119.0"; + version = "0.120.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A="; + hash = "sha256-hCcutRfx0GtnYJYoQ/2S8Y+OmxLCtHWzTCdozWUatXY="; }; - vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k="; + vendorHash = "sha256-59Q7IN7VK7tQv5w7qyxSz16G+Kmsrslu8we9S3aJeAg="; doCheck = false; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 9445ed8f1f92..26c0f4bca05a 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -7,26 +7,26 @@ , scdoc , wayland , wayland-protocols -, zig_0_10 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ifreund"; repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; + hash = "sha256-Q1FlahawsnJ77gP6QVs9AR058rhMU92iueRPudPf+sE="; }; nativeBuildInputs = [ pkg-config scdoc wayland - zig_0_10.hook + zig_0_11.hook ]; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index acead1775d25..507430e231c7 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA="; + sha256 = "sha256-vlUR/fr/PFUBzvxebssrcUgfgnDpFuLuJOl5SBEMKR8="; }; vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; diff --git a/pkgs/by-name/gu/guile-sjson/package.nix b/pkgs/by-name/gu/guile-sjson/package.nix new file mode 100644 index 000000000000..8f9b49f95e06 --- /dev/null +++ b/pkgs/by-name/gu/guile-sjson/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, autoreconfHook +, guile +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-sjson"; + version = "0.2.2"; + + src = fetchFromGitLab { + owner = "dustyweb"; + repo = "guile-sjson"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MmnEZhJTbZDIO8vWVCoTt4rGbOjfPZQ3bqAGv4ei69o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + ]; + + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "S-expression based json reader/writer for Guile"; + homepage = "https://gitlab.com/dustyweb/guile-sjson"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ galaxy ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/by-name/uu/uuu/completion.bash b/pkgs/by-name/uu/uuu/completion.bash new file mode 100644 index 000000000000..702fe98333cf --- /dev/null +++ b/pkgs/by-name/uu/uuu/completion.bash @@ -0,0 +1,4 @@ +_uuu_autocomplete() { + COMPREPLY=($(uuu $1 $2 $3)) +} +complete -o nospace -F _uuu_autocomplete uuu diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix new file mode 100755 index 000000000000..831119e1d471 --- /dev/null +++ b/pkgs/by-name/uu/uuu/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script + +, cmake +, installShellFiles +, pkg-config + +, bzip2 +, libusb1 +, openssl +, zlib +, zstd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uuu"; + version = "1.5.125"; + + src = fetchFromGitHub { + owner = "nxp-imx"; + repo = "mfgtools"; + rev = "uuu_${finalAttrs.version}"; + hash = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + cmake + installShellFiles + pkg-config + ]; + + buildInputs = [ + bzip2 + libusb1 + openssl + zlib + zstd + ]; + + postPatch = '' + # Avoid the need of calling Git during the build. + echo "uuu_${finalAttrs.version}" > .tarball-version + ''; + + postInstall = '' + installShellCompletion --bash --name uuu.bash ${./completion.bash} + + mkdir -p $out/lib/udev/rules.d + cat <($out/bin/uuu -udev) > $out/lib/udev/rules.d/70-uuu.rules + ''; + + meta = with lib; { + description = "Freescale/NXP I.MX Chip image deploy tools"; + homepage = "https://github.com/nxp-imx/mfgtools"; + license = licenses.bsd3; + maintainers = with maintainers; [ otavio ]; + mainProgram = "uuu"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index 9722d466ae28..179326cfeb83 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -10,17 +10,18 @@ , libpng , ncurses , readline +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "c0"; - version = "unstable-2022-10-25"; + version = "unstable-2023-09-05"; src = fetchFromBitbucket { owner = "c0-lang"; repo = "c0"; - rev = "7ef3bc9ca232ec41936e93ec8957051e48cacfba"; - sha256 = "sha256-uahF8fOp2ZJE8EhZke46sbPmN0MNHzsLkU4EXkV710U="; + rev = "608f97eef5d81bb85963d66f955730dd93996f67"; + hash = "sha256-lRIEtclx+NKxAO72nsvnxVeEGCEe6glC6w8MXh1HEwY="; }; patches = [ @@ -67,6 +68,10 @@ stdenv.mkDerivation rec { mv $out/c0-mode/ $out/share/emacs/site-lisp/ ''; + passthru.updateScript = unstableGitUpdater { + url = "https://bitbucket.org/c0-lang/c0.git"; + }; + meta = with lib; { description = "A small safe subset of the C programming language, augmented with contracts"; homepage = "https://c0.cs.cmu.edu/"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 3359206b22be..76bf38cce169 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.6.4"; + version = "12.6.5"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-638kP/wy8YMkvH+peNA1hjfnNXyng2vsVbTrVul0k4A="; + hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index a82759ba3e57..5d2e3b3245c3 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.8.7"; + version = "1.9.0"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lKV4dRIIkCn/qW8DyqDRHADh0tW0/ocf/29ox9aC0Yo="; + sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 77d57a0a500b..f77caa08bdad 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.10.13"; + version = "2023.10.14"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7zJhdFgEP/QSX78XMt+dxt0x7gUj011LHGi/+grPux0="; + hash = "sha256-P3JDXoxDfolgHN4dgHJqojWbWb88vbvgYhYv2B/myKY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix new file mode 100644 index 000000000000..6f35e2b59e32 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, sphinx +, wavedrom +, xcffib +, cairosvg +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-wavedrom"; + version = "3.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0zTHVBr9kXwMEo4VRTFsxdX2HI31DxdHfLUHCQmw1Ko="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + sphinx + wavedrom + xcffib + cairosvg + ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.wavedrom" ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = with lib; { + description = "A sphinx extension that allows including wavedrom diagrams by using its text-based representation"; + homepage = "https://github.com/bavovanachte/sphinx-wavedrom"; + license = licenses.mit; + maintainers = with maintainers; [ fsagbuya ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 95458eda9d46..961f3287e647 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-P1wDsCMg0CfGZ9px1SiEDNT9plYlcrl9UrCLJ0pOra0="; + hash = "sha256-lh3nK3yj03pEurjw6/fMh70GnBawxUqilupUzfgryG0="; }; - cargoHash = "sha256-sIFe5/2/FZA+vTYxo6wZ0w655ZjB8EThsEP7q1PaJjQ="; + cargoHash = "sha256-lUeCMyH6qE76SVjubWVo/Hpj6J8PM6ndOqrJufcfByw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index e89e00fa0110..668fc47fe72d 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.0"; + version = "0.46.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-ZCWdOvwWXSeFzRQiiObuJqvz0ngAJ8n/0LeoGCv2vu4="; + sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI="; }; vendorHash = null; diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index b3c2604d62ee..500f0882796e 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -17,13 +17,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W0Vk1G/NI2u/iWhR5Q9Dwo9Ndq4QDiWUae6K22QfHfo="; + sha256 = "sha256-yPDByM09rc9zRLh0ONcY5bScY4NOrKDv0Pdwo97Czcs="; }; client = buildNpmPackage { @@ -37,7 +37,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-ep67S92WWvZO578EIpJCkdgMJAG/qJLe8twy4663RHQ="; + npmDepsHash = "sha256-ZNkHDNjaQbUt3oWnNIYPYkcvjelieY4RJxNSbzR1+JM="; }; wrapper = import ./wrapper.nix { @@ -52,7 +52,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-SutXEc9kKV/9E/Sh1gl49W6JcN/w+6FIJwL8rxPbBVA="; + npmDepsHash = "sha256-PVgK8R8sf16KKQS/mPXtvit9CW9+4Gc9Onpaw+SSgNI="; installPhase = '' mkdir -p $out/opt/client diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 94f77b5dfdaa..f586b606f1d2 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,6 +13,7 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , fetchpatch +, nixosTests }: let @@ -28,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hOnZ6oHLvunZL6MrCmR5GkROQNww34QQ3m4gYDaSpb4="; + sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; patches = lib.optionals stdenv.isDarwin [ @@ -76,6 +77,10 @@ stdenv.mkDerivation rec { "-DWITH_WEBSOCKETS=ON" ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + passthru.tests = { + inherit (nixosTests) mosquitto; + }; + meta = with lib; { description = "An open source MQTT v3.1/3.1.1/5.0 broker"; homepage = "https://mosquitto.org/"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be210af4f2a..fe2c5b56fe3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13244,6 +13244,8 @@ self: super: with self; { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-wavedrom = callPackage ../development/python-modules/sphinxcontrib-wavedrom { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { };