diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 4f2312cc5de2..326052731a31 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -263,6 +263,15 @@ in { serve = { enable = lib.mkEnableOption "automatic nginx and uwsgi setup for mailman-web"; + uwsgiSettings = lib.mkOption { + default = { }; + example = { uwsgi.buffer-size = 8192; }; + inherit (pkgs.formats.json {}) type; + description = '' + Extra configuration to merge into uwsgi config. + ''; + }; + virtualRoot = lib.mkOption { default = "/"; example = lib.literalExpression "/lists"; @@ -580,18 +589,20 @@ in { }; mailman-uwsgi = lib.mkIf cfg.serve.enable (let - uwsgiConfig.uwsgi = { - type = "normal"; - plugins = ["python3"]; - home = webEnv; - http = "127.0.0.1:18507"; - } - // (if cfg.serve.virtualRoot == "/" - then { module = "mailman_web.wsgi:application"; } - else { - mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application"; - manage-script-name = true; + uwsgiConfig = lib.recursiveUpdate { + uwsgi = { + type = "normal"; + plugins = ["python3"]; + home = webEnv; + http = "127.0.0.1:18507"; + } + // (if cfg.serve.virtualRoot == "/" + then { module = "mailman_web.wsgi:application"; } + else { + mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application"; + manage-script-name = true; }); + } cfg.serve.uwsgiSettings; uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig); in { wantedBy = ["multi-user.target"]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index a1fb0b3951e4..c916839f126c 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -384,14 +384,11 @@ in preStart = lib.optionalString cfg.stateless '' rm -rf /var/cache/cups /var/lib/cups /var/spool/cups '' + '' - mkdir -m 0700 -p /var/cache/cups - mkdir -m 0700 -p /var/spool/cups - mkdir -m 0755 -p ${cfg.tempDir} - - mkdir -m 0755 -p /var/lib/cups + (umask 077 && mkdir -p /var/cache/cups /var/spool/cups) + (umask 022 && mkdir -p ${cfg.tempDir} /var/lib/cups) # While cups will automatically create self-signed certificates if accessed via TLS, # this directory to store the certificates needs to be created manually. - mkdir -m 0700 -p /var/lib/cups/ssl + (umask 077 && mkdir -p /var/lib/cups/ssl) # Backwards compatibility if [ ! -L /etc/cups ]; then diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 2a20691351d1..aecdc76d9c68 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - hash = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; + hash = "sha256-3BCLPY104zxALd3wFH8e9PitjmFbPcOfKsLqXowXqnY="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e6cf84fa1cf4..1b92461c778c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2071,8 +2071,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.243.1191"; # compatible with vscode ^1.95 - hash = "sha256-tMUFMi+lBZZQA/8UTyoqQ5s+xnWKh39V8GYErO9ZuSo="; + version = "1.246.1233"; # compatible with vscode ^1.95 + hash = "sha256-Pz46qTCGtn7q7UqCzwkQbuEEkH6tKxZV1HKSUs9WA8M="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index f80ebe74680a..a79b3ec37db7 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.12.5"; + version = "0.13.0"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-wby6xz+pKVZDoAdF3Onkc6/rqMN8zh/b+9Phd7Q9yyo="; + hash = "sha256-mhfn/Lw/W1T2PaIglwrO/7VacDutT6Tgs133ePHL7W4="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-MrnXlvdE17yq8UdFPLOBE7z9hEIZ4mDj56SxXHZTttI="; + hash = "sha256-feghMmcqzFM/Ttk8s4fp8et9Suw2kKLocptzwEcB2Sw="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-F3u1NF1JqZhcJjW9MCIV9iwuhSX1MJ2d/8ndghpUqPI="; + hash = "sha256-bfBj/A41FFMwMAEVw77nEDyk0+fYvi2Tg1Ufihxi9F8="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-rgqArEjpS0Kc89MUBmdbBtK0l94fJfw8vRSwuz3CJC4="; + hash = "sha256-xzf3WrH7BTiaX6NC2n9nLCKuBlFzRDYaSR73VGM7Ldc="; }; }; in diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index a8563a09e4c0..22059873e4bb 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers -, Accelerate, CoreGraphics, CoreVideo +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + autoreconfHook, + pkg-config, + curl, + leptonica, + libarchive, + libpng, + libtiff, + icu, + pango, + Accelerate, + CoreGraphics, + CoreVideo, }: stdenv.mkDerivation rec { pname = "tesseract"; - version = "5.3.4"; + version = "5.5.0"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "sha256-IKxzDhSM+BPsKyQP3mADAkpRSGHs4OmdFIA+Txt084M="; + sha256 = "sha256-qyckAQZs3gR1NBqWgE+COSKXhv3kPF+iHVQrt6OPi8s="; }; enableParallelBuilding = true; @@ -21,26 +35,28 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ - curl - leptonica - libarchive - libpng - libtiff - icu - pango - opencl-headers - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo - ]; + buildInputs = + [ + curl + leptonica + libarchive + libpng + libtiff + icu + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Accelerate + CoreGraphics + CoreVideo + ]; + passthru.updateScript = nix-update-script { }; meta = { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ patrickdag ]; platforms = lib.platforms.unix; mainProgram = "tesseract"; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8eb02081b06f..96fb2d16fa2b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,11 +390,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-bi2vpG2+iYYQcS6sqram2Pdulk4cHiQNCoT4Q1Z8pJM=", + "hash": "sha256-pqZKqy08PnXfm88eYzDIYqC4rnwUPehfRVMcSX0gaqc=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.11.0", + "rev": "v1.12.0", "spdx": "Apache-2.0", "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, @@ -822,13 +822,13 @@ "vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A=" }, "mongodbatlas": { - "hash": "sha256-ztdzVTCQDPOgXVv/39SDfaNM4wR/zh5ReikEGz4S8Jw=", + "hash": "sha256-0CIHc3cIdhxX2T8dkccOLVFCgY3c1kz6vxlzmEN8YK0=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.21.1", + "rev": "v1.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DJXpVYF1AQ5q4ASJFsIyag6OTFxpRSealN98859G5Ls=" + "vendorHash": "sha256-jHm6fDk8zjrZcWKHOKhhFmRICBwx/d7BD4Ycy8gcQWU=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -1418,12 +1418,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-DPEVUFPcJKZyid7E2Guk04nffnujsyo34MQ+ORlpfqA=", + "hash": "sha256-prXoM9pZDbuWs99y7kXyv+D6pUghzbM6kbbl6L4tXT8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.130.0", + "rev": "v0.133.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JeIDE4RvJQ5PTNyoFrcAV4E8HTDh4YUjUkkYdtri+gk=" + "vendorHash": "sha256-Dl9h+6gVpCg6hwhC348LKjCK88BQk/rZR2I4yujrZFk=" } } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3ed460f960f3..40e1b478bad9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -11,7 +11,7 @@ let { stable = "0.0.76"; ptb = "0.0.118"; - canary = "0.0.527"; + canary = "0.0.528"; development = "0.0.50"; } else @@ -34,7 +34,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-pe1CRsXMxXw+j4pBUT/63ZSBe7Mm0g+Tbyn1dAnxp7o="; + hash = "sha256-ajQHWSpjpuadFlT5WVXsSZf5Ng8ta4SyGbZp7TTb+8Q="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 8d745b0bd81e..a7c41de91166 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -51,6 +51,7 @@ libappindicator-gtk3, libdbusmenu, writeScript, + pipewire, python3, runCommand, libunity, @@ -146,6 +147,7 @@ stdenv.mkDerivation rec { nspr libxcb pango + pipewire libXScrnSaver libappindicator-gtk3 libdbusmenu diff --git a/pkgs/by-name/am/amiri/package.nix b/pkgs/by-name/am/amiri/package.nix index de65e7fb18b7..8f2985952c65 100644 --- a/pkgs/by-name/am/amiri/package.nix +++ b/pkgs/by-name/am/amiri/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "amiri"; - version = "1.000"; + version = "1.001"; src = fetchzip { url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"; - hash = "sha256-WXxKLYIIKe01WWZrI1aLOv65wRgn7aqHl6Codf4foVw="; + hash = "sha256-YwiDY5/Ty5Pwj3d8+UafUNLVZ3omRtFRWQCLn2RkheM="; }; installPhase = '' diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 01c8e8df6abc..995df52160e5 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-RwckZqEL5U60XSYul74p9Ezg+N8FrnLkRFpdxIa7/34="; + hash = "sha256-/I8KCQnjFbE64h2rQuLV31IsVTQhuDxiobQwtx0HRPM="; }; npmDepsHash = "sha256-hCZ68sLpQs/7SYVf3pMAHfstRm1C/d80j8fESIFdhnw="; diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 37ed74621b55..cfd0d2c7f057 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "10.1.0"; + version = "10.1.1"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-xHvFs5j4icsGJsmXGg+WCQRTIx5I6ixEgRqKiYwAZio="; + hash = "sha256-+60s0NMSXRUlYDdoxPeEZYx1EMfMODNA/A7rkje5x7o="; }; - vendorHash = "sha256-xTXWy8L+i3XbsnFqtSU6B/3e5zEXLjIAyKO7zslcr9o="; + vendorHash = "sha256-/cTYfGpGbtPvIwriqemDatcMf+cP76eD6OV0oGQenAk="; subPackages = [ "." ]; diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix index 0e5b8d9a7174..aafe1ad1e918 100644 --- a/pkgs/by-name/di/diffstat/package.nix +++ b/pkgs/by-name/di/diffstat/package.nix @@ -1,15 +1,21 @@ -{ fetchurl, lib, stdenv }: +{ fetchurl, lib, stdenv, zstd, directoryListingUpdater }: stdenv.mkDerivation rec { pname = "diffstat"; - version = "1.66"; + version = "1.67"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; - sha256 = "sha256-9UUxu+Mujg+kYfAYtB469Ra2MggBcvNh8F5QNn7Ltp4="; + hash = "sha256-dg7QyZxtZDI41BuA5gJ4zxaD/7lKKDlUrH7xaMhSdmo="; + }; + + buildInputs = [ zstd ]; + + passthru.updateScript = directoryListingUpdater { + url = "https://invisible-island.net/archives/diffstat/"; }; meta = with lib; { diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix index 820afcbd8f68..3b1a011e10ff 100644 --- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix +++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchurl -, boost -, gfortran -, lhapdf -, ncurses -, perl -, python ? null -, swig -, yoda -, zlib -, withPython ? false +{ + lib, + stdenv, + fetchurl, + boost, + gfortran, + lhapdf, + ncurses, + perl, + python ? null, + swig, + yoda, + zlib, + withPython ? false, }: stdenv.mkDerivation rec { @@ -19,9 +20,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; - sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; + hash = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; }; + postPatch = '' + substituteInPlace py-compile \ + --replace-fail "import sys, os, py_compile, imp" "import sys, os, py_compile, importlib" \ + --replace-fail "imp." "importlib." \ + --replace-fail "hasattr(imp" "hasattr(importlib" + ''; + patches = [ # Compatibility with YODA 2.x ./yoda2_support.patch @@ -33,12 +41,16 @@ stdenv.mkDerivation rec { gfortran.cc.lib lhapdf yoda - ] ++ lib.optional withPython python - ++ lib.optional (withPython && python.isPy3k) ncurses; + ] ++ lib.optional withPython python ++ lib.optional (withPython && python.isPy3k) ncurses; - propagatedBuildInputs = [ - zlib - ] ++ lib.optional withPython swig; + propagatedBuildInputs = + [ + zlib + ] + ++ lib.optional withPython [ + swig + python.pkgs.distutils + ]; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ @@ -67,7 +79,7 @@ stdenv.mkDerivation rec { # None of our currently packaged versions of swig are C++17-friendly # Use a workaround from https://github.com/swig/swig/issues/1538 - env.CXXFLAGS="-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES"; + env.CXXFLAGS = "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES"; meta = with lib; { homepage = "http://fastnlo.hepforge.org"; diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index 4b7c40bf983d..7a3ce5677280 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -1,45 +1,58 @@ -{ lib -, stdenv -, makeWrapper -, fetchFromGitHub -, libX11 -, pkg-config -, gdb -, freetype -, freetypeSupport ? true -, extensions ? [ ] +{ + lib, + stdenv, + makeWrapper, + fetchFromGitHub, + libX11, + pkg-config, + gdb, + freetype, + freetypeSupport ? true, + withExtensions ? true, + extraFlags ? "", + pluginsFile ? null, }: stdenv.mkDerivation { pname = "gf"; - version = "unstable-2023-08-09"; + version = "0-unstable-2024-08-21"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "4190211d63c1e5378a9e841d22fa2b96a1099e68"; - hash = "sha256-28Xgw/KxwZ94r/TXsdISeUtXHSips4irB0D+tEefMYE="; + rev = "40f2ae604f3b94b7f818680ac53d4683c629bcf3"; + hash = "sha256-Z8hW/GQjnnojoLeetrBlMnAJ9sP9ELv1lSQJjYPxtRc="; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; - buildInputs = [ libX11 gdb ] - ++ lib.optional freetypeSupport freetype; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ + libX11 + gdb + ] ++ lib.optional freetypeSupport freetype; patches = [ ./build-use-optional-freetype-with-pkg-config.patch ]; - postPatch = lib.forEach extensions (ext: '' - cp ${ext} ./${ext.name or (builtins.baseNameOf ext)} - ''); + postPatch = [ + (lib.optionalString withExtensions '' + cp ./extensions_v5/extensions.cpp . + '') + (lib.optionalString (pluginsFile != null) '' + cp ${pluginsFile} ./plugins.cpp + '') + ]; - preConfigure = '' - patchShebangs build.sh - ''; + preConfigure = '' + patchShebangs build.sh + ''; buildPhase = '' runHook preBuild - extra_flags=-DUI_FREETYPE_SUBPIXEL ./build.sh + extra_flags="${extraFlags} -DUI_FREETYPE_SUBPIXEL" ./build.sh runHook postBuild ''; @@ -51,7 +64,7 @@ stdenv.mkDerivation { ''; postFixup = '' - wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath[ gdb ]} + wrapProgram $out/bin/gf2 --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; meta = with lib; { diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 145f094aaaf8..e30006dcc4d5 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -21,9 +21,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X" "github.com/openconfig/gnmic/app.version=${version}" - "-X" "github.com/openconfig/gnmic/app.commit=${src.rev}" - "-X" "github.com/openconfig/gnmic/app.date=1970-01-01T00:00:00Z" + "-X" "github.com/openconfig/gnmic/pkg/app.version=${version}" + "-X" "github.com/openconfig/gnmic/pkg/app.commit=${src.rev}" + "-X" "github.com/openconfig/gnmic/pkg/app.date=1970-01-01T00:00:00Z" ]; subPackages = [ "." ]; diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index a92eb386830e..1be331ffa0c4 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.18.3"; + version = "1.19.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-ep9RYHnqmOEqfdFtYzOZnv0aWu4TA8JMyWOj0E2uSYk="; + hash = "sha256-MnTPu7jsjHR+PDHzj/zJiBKi9Ou/cjJvrf87yMdSnz0="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 5c4a430ff973..2e9349be5365 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; - version = "7.4.0"; + version = "7.5.0"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; rev = finalAttrs.version; - hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E="; + hash = "sha256-1wHRzh/Fdxdgx70fIPNOIpqBX9IvYPJnV7CZ5hLQ0qE="; }; - vendorHash = "sha256-604n3Z4R2+zca+NN75Y7afa2Y6Y6ussxE+MEQsDLWsg="; + vendorHash = "sha256-KULTijHG5717dDOfvB4yR+ztrB+mbYaosgmg8aV/GAs="; meta = { changelog = "https://magerun.net/category/magerun/"; diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index 13c4c3859027..3dad4f57ae5d 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-08-16 +2024-11-26 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index 7a87d26cbf6d..8383170af553 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -9,8 +9,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/14be7e665024f1a8c31d748b22f5e215856d3479.tar.gz"; - sha256 = "017a1069sy4bhc2wchgd5hl6c106spf0zq5dcg65mf4flba1xs0j"; + url = "https://github.com/nixos/nixfmt/archive/cb92834560306868e4020dd643f09482587c6e7a.tar.gz"; + sha256 = "0fg2mdjny6i90bivw5d4wxl522azmcmikcak2ffgrq69qhjv21f6"; }; isLibrary = true; isExecutable = true; @@ -20,7 +20,7 @@ mkDerivation { ]; executableHaskellDepends = [ base bytestring cmdargs directory file-embed filepath - safe-exceptions text unix + safe-exceptions text transformers unix ]; jailbreak = true; homepage = "https://github.com/NixOS/nixfmt"; diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 7a171733b480..c97d5bafcbac 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2024.11.05.0"; + version = "2024.11.28.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-/h7Apqo0N4aQvLfzfV/v35npo1wwOOZksokJKhCp8oA="; + hash = "sha256-1n5b5qmyVSBEptRGX+G4O79Ibm+MHGNWLtOcQIRhr+A="; }; - vendorHash = "sha256-nfy2H6isjW7m0UdPaX9Kqt2iwA2IwOhHE+xmqJ2t1qo="; + vendorHash = "sha256-TuHZkZLklBgI56mEHRZOLRFBGjHqWe2sVAA33IyqdH4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 11d0e510a960..38e86fa8e56a 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ stdenv, }: let - version = "0.2.9"; + version = "0.2.10"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; rev = "refs/tags/v${version}"; - hash = "sha256-PiJRVf+rpYFWRmys7Ca2lLfe5F9/ksIzkpKs6CQWu+A="; + hash = "sha256-hIhg6OeWCp27OPHg10ifjsSvPrBHQMnn4P3CmyYmdDk="; }; - cargoHash = "sha256-L0gXxV/3+5oRV/Ipm4sRqr9dh9AEChWhtILO3PaNxYY="; + cargoHash = "sha256-MYqVo+7xQzF55rEqUJNcB1SAEoxowHl+vOINCyr59nA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 911c479c7189..355ca94f8334 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.27.5"; + version = "0.28.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-0KIAO9KPP9Lrrw9IIaRdlmmfJ0mwQK0ne//Zofu3TfE="; + hash = "sha256-FmhfsfRq6pxDhGDsNqY2IQczHk8NYEdxNaN2hfbhDYw="; }; - vendorHash = "sha256-yi4mbuCaT6ydnZwhqqhqMI7bF6IwHm0UqfR5JM81/Ik="; + vendorHash = "sha256-ZziypdQJaQHdL5/bcX6P5VHGVtbcl+twtlOg7DlmLZM="; ldflags = [ "-w" diff --git a/pkgs/by-name/tr/trunk-io/package.nix b/pkgs/by-name/tr/trunk-io/package.nix index cb02c0b393d0..6e965dc48b1e 100644 --- a/pkgs/by-name/tr/trunk-io/package.nix +++ b/pkgs/by-name/tr/trunk-io/package.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: stdenv.mkDerivation (finalAttrs: { pname = "trunk-io"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { url = "https://trunk.io/releases/launcher/${finalAttrs.version}/trunk"; - hash = "sha256-zrfnPWHFoFQkVtxPedKrL1Y1xLZSDX3JuF0qgo/hhnE="; + hash = "sha256-ifvdjHtjZJ7rFHlBV1e4mJA8BB5ztJt4Ao29ZOyjCHo="; }; dontUnpack = true; @@ -19,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://trunk.io/"; description = "Developer experience toolkit used to check, test, merge, and monitor code"; - license = licenses.unfree; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ aaronjheng ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ aaronjheng ]; }; }) diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 122f3f6bdf1b..cef986ddae01 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -1,26 +1,29 @@ { lib, stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc , mesa, lz4, zstd, ffmpeg, libva +, wayland, wayland-scanner }: stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - hash = "sha256-4I8ohllhIA3/LNgFAKH5GwwHKO5QKNex0+Be0OOgR14="; + hash = "sha256-DW+WWwuav0lxnoV55L8RrX0enRURRnHMljtwEC0+9t4="; }; strictDeps = true; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ # Optional dependencies: mesa lz4 zstd ffmpeg libva + + wayland ]; meta = with lib; { diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix index d26ae0780da2..f94b6f971f8b 100644 --- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -125,6 +125,12 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "LOCAL_INSTALL" true) (lib.cmakeBool "enable_mirclient" false) + # libexec has binaries that services will run + # To reduce size for non-Lomiri situations that pull this package in (i.e. ayatana indicators) + # we want only the solib in lib output + # But service files have LIBEXECDIR path hardcoded, which would need manual fixing if using moveToOutput in fixup + # Just tell it to put libexec stuff into other output + (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "${placeholder "out"}/libexec") ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -153,7 +159,6 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' moveToOutput share $out - moveToOutput libexec $out ''; passthru = { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 5a47eda36425..153ba7901460 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -79,7 +79,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.46.3"; + version = "2.46.4"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -90,7 +90,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-heCfpv+f6klni6mXXbxk6jJCgz+Pin1qiTey8pL8so0="; + hash = "sha256-Dv9fCrCihy7IffYrwy4yicivYlcWrHHpSymNdOA3QXY="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 40d7a9c0dd69..41d10a3dd352 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; - version = "2.6.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-W4LNzdgWxXDPL46/C8SX99lpRMp/xL5q5v6vX3H80XU="; + hash = "sha256-6SO5LUK39pEVcJqL86CwuyU7xpi8ydJxin5sHqBYwmg="; }; - vendorHash = "sha256-9oInSBlN6hDe9Bj/ISP/7O9Q1xp4tXRm99XhsrJog0E="; + vendorHash = "sha256-pupoPA4VZKACv4nPiRIwe1BOXojnnXrjKOpq0JGl9Uc="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 5701261ea371..f77c7803fd88 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "1.11.8"; + version = "2.0.2"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-wF2OqJ0kg+wEjSq8mAyF5em5RAqjyXqKFkdAjxOrePM="; + hash = "sha256-sLta3LnGtbJ4CMzQ+GRhI13orBvo4Q/kEtCDWcJRSI4="; }; - vendorHash = "sha256-IHnPhV4H8xkonjllOGMmB0zibaGapc8XBrg4km/jKb4="; + vendorHash = "sha256-t9KTZUj3FYH9lpQikesZpq180HqQB8hqE0xyneFgbRA="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index f720809863ab..6d7a66005713 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.5.5"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-RX2FnXUALE4l5RG+L6KUBR57IlhRUSOxNc9JQMDDgvw="; + hash = "sha256-fGl3nHU2MlSKFWh4lkpXWad7ivMhxkIsbODcZOemYaQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index da12de464ff8..b34777add45b 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-4P+bQEldyBNh4qsIkoZLXnUOrQ5wVGbr55xbS0oQMMM="; + hash = "sha256-b+AxR6TFHrejSeU6el5beCFscKIsyaonMDC8jZWShRM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libuuu/default.nix b/pkgs/development/python-modules/libuuu/default.nix new file mode 100644 index 000000000000..2cd77ce3b699 --- /dev/null +++ b/pkgs/development/python-modules/libuuu/default.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-scm, + autoPatchelfHook, + pytestCheckHook, + udev, +}: + +buildPythonPackage rec { + pname = "libuuu"; + version = "1.5.182"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-k6JwGxYeFbGNl7zcuKN6SbRq8Z4yD1dXXL3ORyGqhYE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + udev + ]; + + dependencies = [ + setuptools-scm + ]; + + pythonImportsCheck = [ + "libuuu" + ]; + + # Prevent tests to load the plugin from the source files instead of the installed ones + preCheck = '' + rm -rf libuuu + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python wraper for libuuu"; + homepage = "https://github.com/nxp-imx/mfgtools/tree/master/wrapper"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + badPlatforms = [ + # The pypi archive does not contain the pre-built library for these platforms + "aarch64-linux" + "x86_64-darwin" + ]; + }; +} diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 23a26fd52a1b..a12730c9f584 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { packaging pillow ]; + disabledTests = [ + # https://github.com/madmaze/pytesseract/pull/559 + "incorrect_tessdata_dir" + "invalid_tessdata_dir" + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 863725b5fd04..864fce11cb15 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -59,14 +59,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.50.0"; + version = "0.50.1"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-pOzIhqI4XmJm3GiGN2+zOALEogyB4qDgB71TJoLKd+4="; + hash = "sha256-oNJVOz2FMMhUkYIajeWwRmHzLcXu5qTSQzjk0gciOnE="; }; build-system = [ diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 26dfd177e285..81109c3cb811 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -2,6 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies asn1crypto, bincopy, bitstring, @@ -13,8 +19,10 @@ cryptography, deepmerge, fastjsonschema, + filelock, hexdump, libusbsio, + libuuu, oscrypto, packaging, platformdirs, @@ -23,30 +31,41 @@ pyserial, requests, ruamel-yaml, - setuptools-scm, sly, - spsdk, - testers, typing-extensions, + + # tests ipykernel, pytest-notebook, pytestCheckHook, voluptuous, + versionCheckHook, }: buildPythonPackage rec { pname = "spsdk"; - version = "2.2.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = "spsdk"; - rev = "refs/tags/${version}"; - hash = "sha256-qFgG9jdF667EtMqXGGk/oxTEi+6J2s/3gKokP+JaFVw="; + rev = "refs/tags/v${version}"; + hash = "sha256-WRR4YyA4HaYoyOZSt/RYivhH2E/20DKLXExWg2yOL48="; }; - build-system = [ setuptools-scm ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=72.1,<74" "setuptools" + + substituteInPlace setup.py \ + --replace-fail "setuptools>=72.1,<74" "setuptools" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; pythonRelaxDeps = [ "cryptography" @@ -55,9 +74,11 @@ buildPythonPackage rec { "typing-extensions" ]; - # Remove unneeded unfree package. pyocd-pemicro is only used when - # generating a pyinstaller package, which we don't do. - pythonRemoveDeps = [ "pyocd-pemicro" ]; + pythonRemoveDeps = [ + # Remove unneeded unfree package. pyocd-pemicro is only used when + # generating a pyinstaller package, which we don't do. + "pyocd-pemicro" + ]; dependencies = [ asn1crypto @@ -71,8 +92,10 @@ buildPythonPackage rec { cryptography deepmerge fastjsonschema + filelock hexdump libusbsio + libuuu oscrypto packaging platformdirs @@ -85,23 +108,32 @@ buildPythonPackage rec { typing-extensions ]; + pythonImportsCheck = [ "spsdk" ]; + + preInstallCheck = '' + export HOME="$(mktemp -d)" + ''; + nativeCheckInputs = [ ipykernel pytest-notebook pytestCheckHook voluptuous + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + disabledTests = [ + # Missing rotk private key + "test_general_notebooks" ]; - pythonImportsCheck = [ "spsdk" ]; - - passthru.tests.version = testers.testVersion { package = spsdk; }; - - meta = with lib; { - changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; + meta = { + changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/v${version}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ frogamic sbruder ]; diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 79f8f638c08c..702c88de4db1 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -1,37 +1,42 @@ -{ lib -, stdenv -, pkg-config -, cmake -, fetchurl -, git -, cctools -, darwin -, makeWrapper -, bison -, openssl -, protobuf -, curl -, zlib -, libssh -, zstd -, lz4 -, readline -, libtirpc -, rpcsvc-proto -, libedit -, libevent -, icu -, re2 -, ncurses -, libfido2 -, python3 -, cyrus_sasl -, openldap -, antlr +{ + lib, + stdenv, + pkg-config, + cmake, + fetchurl, + git, + cctools, + darwin, + makeWrapper, + bison, + openssl, + protobuf, + curl, + zlib, + libssh, + zstd, + lz4, + readline, + libtirpc, + rpcsvc-proto, + libedit, + libevent, + icu, + re2, + ncurses, + libfido2, + python3, + cyrus_sasl, + openldap, + antlr, }: let - pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + pythonDeps = with python3.pkgs; [ + certifi + paramiko + pyyaml + ]; mysqlShellVersion = "8.4.3"; mysqlServerVersion = "8.4.3"; @@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool ''; - nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] + nativeBuildInputs = + [ + pkg-config + cmake + git + bison + makeWrapper + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + darwin.DarwinTools + ]; - buildInputs = [ - curl - libedit - libssh - lz4 - openssl - protobuf - readline - zlib - zstd - libevent - icu - re2 - ncurses - libfido2 - cyrus_sasl - openldap - python3 - antlr.runtime.cpp - ] ++ pythonDeps - ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + buildInputs = + [ + curl + libedit + libssh + lz4 + openssl + protobuf + readline + zlib + zstd + libevent + icu + re2 + ncurses + libfido2 + cyrus_sasl + openldap + python3 + antlr.runtime.cpp + ] + ++ pythonDeps + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 573245955006..75bd98d9681a 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -1,37 +1,42 @@ -{ lib -, stdenv -, pkg-config -, cmake -, fetchurl -, git -, cctools -, darwin -, makeWrapper -, bison -, openssl -, protobuf -, curl -, zlib -, libssh -, zstd -, lz4 -, readline -, libtirpc -, rpcsvc-proto -, libedit -, libevent -, icu -, re2 -, ncurses -, libfido2 -, python3 -, cyrus_sasl -, openldap -, antlr +{ + lib, + stdenv, + pkg-config, + cmake, + fetchurl, + git, + cctools, + darwin, + makeWrapper, + bison, + openssl, + protobuf, + curl, + zlib, + libssh, + zstd, + lz4, + readline, + libtirpc, + rpcsvc-proto, + libedit, + libevent, + icu, + re2, + ncurses, + libfido2, + python3, + cyrus_sasl, + openldap, + antlr, }: let - pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + pythonDeps = with python3.pkgs; [ + certifi + paramiko + pyyaml + ]; mysqlShellVersion = "9.1.0"; mysqlServerVersion = "9.1.0"; @@ -70,32 +75,44 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool ''; - nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] + nativeBuildInputs = + [ + pkg-config + cmake + git + bison + makeWrapper + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + darwin.DarwinTools + ]; - buildInputs = [ - curl - libedit - libssh - lz4 - openssl - protobuf - readline - zlib - zstd - libevent - icu - re2 - ncurses - libfido2 - cyrus_sasl - openldap - python3 - antlr.runtime.cpp - ] ++ pythonDeps - ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + buildInputs = + [ + curl + libedit + libssh + lz4 + openssl + protobuf + readline + zlib + zstd + libevent + icu + re2 + ncurses + libfido2 + cyrus_sasl + openldap + python3 + antlr.runtime.cpp + ] + ++ pythonDeps + ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs b/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs index 4da45f647d46..941dbcaa5a78 100644 --- a/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs +++ b/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs @@ -24,7 +24,7 @@ fn validate_setting_name(key: &str) -> bool { (first_char.is_alphabetic() || first_char == '*') && key[1..] .chars() - .all(|c| c.is_alphanumeric() || c == '_' || c == '*') + .all(|c| c.is_alphanumeric() || c == '_' || c == '*' || c == '-') } const SPECIAL_TYPES: [&str; 5] = ["octal", "hex", "float", "list", "array"]; diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix index 7b0df23ee663..e14fcce2f099 100644 --- a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix @@ -14,6 +14,9 @@ let simple_top_level_attr = "1.0"; nested.attrset.has.a.integer.value = 100; some_floaty = 29.95; + ## dashes in key names + top-level-dash = "pass"; + nested.level-dash = "pass"; ## Same syntax here on these two, but they should get serialized differently: # > A list may have zero or more elements, each of which can be a scalar value, an array, a group, or another list. list1d = libconfig.lib.mkList [ 1 "mixed!" 5 2 ]; diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt index ef6e09f8111a..0bdf80f8a749 100644 --- a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt @@ -1,6 +1,6 @@ array1d=[1, 5, 2];array2d=([1, 2], [2, 1]);list1d=(1, "mixed!", 5, 2);list2d=(1, (1, 1.2, "foo"), ("bar", 1.2, 1));nasty_string="\"@ \\ ^*bf -0\";'''$";nested={attrset={has={a={integer={value=100;};};};};};simple_top_level_attr="1.0";some_floaty=29.95;weirderTypes={ +0\";'''$";nested={attrset={has={a={integer={value=100;};};};};level-dash="pass";};simple_top_level_attr="1.0";some_floaty=29.95;top-level-dash="pass";weirderTypes={ @include "@include_file@" array_of_ints=[0732, 0xa3, 1234];bigint=9223372036854775807;float=0.0012;hex=0x1fc3;list_of_weird_types=(3.141592654, 9223372036854775807, 0x1fc3, 027, 1.2e-32, 1.0);octal=027;pi=3.141592654;}; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 077a592bd024..d0e600f056ec 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -20,17 +20,32 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: { - postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; - }); - in stdenv.mkDerivation { pname = "openafs"; version = "${version}-${kernel.modDirVersion}"; inherit src; - patches = [ ]; + patches = [ + # Linux: Define Clear/Set PageError macros as NOPs + (fetchpatch { + url = "https://gerrit.openafs.org/changes/15964/revisions/917d071a1b3c3e23c984ca8e5501ddccd62a01b6/patch"; + decode = "base64 -d"; + hash = "sha256-WqAHRN1YZj7Cz4X4iF1K3DJC1h8nXlnA9gveClL3KHc="; + }) + # Linux: Refactor afs_linux_write_begin() variants + (fetchpatch { + url = "https://gerrit.openafs.org/changes/15965/revisions/c955b666b904b96620df10328a9a37c2fb5f2ed6/patch"; + decode = "base64 -d"; + hash = "sha256-U2W+8YrD1K7Pb/Jq08uBcuPnGkVvcSyTpwaWWcTbq0w="; + }) + # Linux: Use folios for aops->write_begin/end + (fetchpatch { + url = "https://gerrit.openafs.org/changes/15966/revisions/d1706bdc5080b86b1876d10f062c369e8d898188/patch"; + decode = "base64 -d"; + hash = "sha256-jY+r9LO/4g6K9J1stxNCa38nyr1/J3beOhG9YilEbzg="; + }) + ]; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index d3b5ad2e4a43..860ba48900d1 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncdu"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; - hash = "sha256-P0cevTi1bmDauAwn468dgmZmlX8C2ehBmxSdqvet5QU="; + hash = "sha256-shjMFKK7mFLPlR204hrsiYDnqMOsoJfjqjQX8g65MAA="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5065e4563a8..64e349ca071f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7362,6 +7362,8 @@ self: super: with self; { inherit (pkgs) libusbsio; }; + libuuu = callPackage ../development/python-modules/libuuu { }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion; };