From b22f0e999ec06f1e00e0634efa5c262e1e59b912 Mon Sep 17 00:00:00 2001 From: Lukas Lihotzki Date: Mon, 15 Apr 2024 01:57:21 +0200 Subject: [PATCH 01/30] kile: 2.9.93 -> 2.9.94 --- pkgs/applications/editors/kile/default.nix | 72 ++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 0e1326f50c49..01f8723e8030 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,63 +1,43 @@ -{ mkDerivation -, lib +{ lib +, stdenv , fetchurl -, extra-cmake-modules -, kdoctools -, wrapGAppsHook -, qtscript -, kconfig -, kcrash -, kdbusaddons -, kdelibs4support -, kguiaddons -, kiconthemes -, kinit -, khtml -, konsole -, kparts -, ktexteditor -, kwindowsystem -, okular -, poppler +, cmake +, kdePackages +, qt6 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kile"; - version = "2.9.93"; + version = "2.9.94"; src = fetchurl { url = "mirror://sourceforge/kile/kile-${version}.tar.bz2"; - sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; + sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o="; }; nativeBuildInputs = [ - extra-cmake-modules - wrapGAppsHook - kdoctools + cmake + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook + kdePackages.kdoctools ]; buildInputs = [ - kconfig - kcrash - kdbusaddons - kdelibs4support - kguiaddons - kiconthemes - kinit - khtml - kparts - ktexteditor - kwindowsystem - okular - poppler - qtscript + qt6.qtbase + qt6.qtdeclarative + qt6.qt5compat + kdePackages.kconfig + kdePackages.kcrash + kdePackages.kdbusaddons + kdePackages.kguiaddons + kdePackages.kiconthemes + kdePackages.konsole + kdePackages.kparts + kdePackages.ktexteditor + kdePackages.kwindowsystem + kdePackages.okular + kdePackages.poppler ]; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - propagatedUserEnvPkgs = [ konsole ]; meta = { description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c25cf792205..3808c5213eba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32387,7 +32387,7 @@ with pkgs; kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; - kile = libsForQt5.callPackage ../applications/editors/kile { }; + kile = callPackage ../applications/editors/kile { }; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; From 7bc38afb3d2734f2957b5a23b5abf96514de9826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 21:20:13 +0000 Subject: [PATCH 02/30] python311Packages.fast-histogram: 0.12 -> 0.14 --- pkgs/development/python-modules/fast-histogram/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index 229e448ea704..d3e4e3eb6720 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fast-histogram"; - version = "0.12"; + version = "0.14"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astrofrog"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-vIzDDzz6e7PXArHdZdSSgShuTjy3niVdGtXqgmyJl1w="; }; nativeBuildInputs = [ From 32da45d943575e585c4a03b1d2b9039745c5c545 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:19:42 +0900 Subject: [PATCH 03/30] python311Packages.opentelemetry-api: add updateScript --- .../python-modules/opentelemetry-api/default.nix | 15 +++++++++++++-- .../opentelemetry-instrumentation/default.nix | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 135518ce3f8c..ec4c9dc2204d 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -9,6 +9,7 @@ , setuptools , pytestCheckHook , pythonRelaxDepsHook +, writeScript }: let @@ -55,8 +56,18 @@ let doCheck = false; - # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. - passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api + nix-update python3Packages.opentelemetry-instrumentation + ''; + # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. + tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + }; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 965276da78f1..68a32268ebbd 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation" ]; + passthru.updateScript = opentelemetry-api.updateScript; + meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; From a86f7b674f09a8f3d5e8e6ea0f69ab5d643762fc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:40:40 +0900 Subject: [PATCH 04/30] python311Packages.opentelemetry-api: 1.23.0 -> 1.24.0 Diff: https://github.com/open-telemetry/opentelemetry-python/compare/refs/tags/v1.23.0...v1.24.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.24.0 --- pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index ec4c9dc2204d..153400f30ace 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; + hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs="; }; sourceRoot = "${src.name}/opentelemetry-api"; From 96bb1fe6abbb1f618acc99302d3195c2fd8ec5fa Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:40:52 +0900 Subject: [PATCH 05/30] python311Packages.opentelemetry-instrumentation: 0.44b0 -> 0.45b0 Diff: https://github.com/open-telemetry/opentelemetry-python-contrib/compare/refs/tags/v0.44b0...v0.45b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.45b0 --- .../python-modules/opentelemetry-instrumentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 68a32268ebbd..38205814d047 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.44b0"; + version = "0.45b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; + hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; From 7b2e4223346a8e0d362b1a32419217118a964fa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Apr 2024 15:58:44 +0000 Subject: [PATCH 06/30] zrok: 0.4.26 -> 0.4.27 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 6de421dce2d1..ac21cd9d0fcf 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-XzMd2NgMY8AUSjdYDyOEcK3HlZ5hl+L/ulHgy2iDtKg="; - aarch64-linux = "sha256-ypjg73ciUhXIyiNSLzim8AZV0ByU27WRc3PJqTyTllg="; - armv7l-linux = "sha256-VgVn5NsGpvGpkLQRZDphOgeZFQzhR2rVfcwi/EkJ/y4="; + x86_64-linux = "sha256-cg/4BNjL0+Zl8AHJOK/vVutXrz1aLJ+4cHvzcx5iU/8="; + aarch64-linux = "sha256-W+wTOZUYMqqAOrnhrWsnGYfz7FUQ7D/ssoMsZWrhTqw="; + armv7l-linux = "sha256-Sgfrms2prm3VJECKoqb5NaTYkgGHTdfm2mcR+BIPm2U="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.26"; + version = "0.4.27"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; From 11acfa59d248643a0a8fb335242d279d2f533182 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 04:36:21 +0000 Subject: [PATCH 07/30] protoc-gen-entgrpc: 0.4.5 -> 0.5.0 --- pkgs/development/tools/protoc-gen-entgrpc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 53d7d4338776..3fbd49679225 100644 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE="; + sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4="; }; - vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y="; + vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; From 32bd0dde1ff27bda9487677116e76a514a920171 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 06:01:18 +0000 Subject: [PATCH 08/30] obs-studio-plugins.input-overlay: 5.0.4 -> 5.0.5 --- pkgs/applications/video/obs-studio/plugins/input-overlay.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 8926b7e1764b..9f13de284740 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "obs-input-overlay"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ="; + sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; fetchSubmodules = true; }; From 7e0bc287e385ab6a8d45bf27a6206ef5c0e415b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 12:19:26 +0000 Subject: [PATCH 09/30] vitess: 19.0.1 -> 19.0.3 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index 6ace9ba59251..2d107cc56246 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "19.0.1"; + version = "19.0.3"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M="; + hash = "sha256-Zy54nZCnwyZ1JNPvaKi0/bRt5g5ucPANwer/3pl4dGU="; }; - vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw="; + vendorHash = "sha256-QUzBxYEvxVzv4c8tKiFb+4NLy8RsXh0QTn9twfstMtw="; buildInputs = [ sqlite ]; From 7c46ff89e67b02e9728a8bc0cf8cde8ae0b81bde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 13:11:23 +0000 Subject: [PATCH 10/30] hcloud: 1.43.0 -> 1.43.1 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index d5919034ca8a..f59340ae2e62 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.43.0"; + version = "1.43.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-czuMlnVhUDWGVbIZ0V7vaoOnT84WKPFjhcUvt5BzBXo="; + hash = "sha256-XPDaywSCvXc9jo8bNxaF9Pj6Vs+Hz0MxDPbbnRNW3VI="; }; - vendorHash = "sha256-0XFgi2cPlsL4zCbttGrEsm0j5ftB8MAuphu3YNlPbIs="; + vendorHash = "sha256-pN+HMsZ2FpxwF/yPfYGwJNj9i4fgnE3cKo3mti3KoR0="; ldflags = [ "-s" From 7372fd42d59a7fabfdd6fa901953ca3fe1c4cd4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 13:13:06 +0000 Subject: [PATCH 11/30] kuttl: 0.15.0 -> 0.16.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index cae6540e39fe..0171ed2c0be1 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.15.0"; + version = "0.16.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; + sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8="; }; - vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; + vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww="; subPackages = [ "cmd/kubectl-kuttl" ]; From e2a78e866fd68e73febc3892e6097285dfa800d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Apr 2024 21:13:43 +0000 Subject: [PATCH 12/30] dxvk_2: 2.3 -> 2.3.1 --- pkgs/by-name/dx/dxvk_2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index 8c589fd72587..806abea0981c 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "doitsujin"; repo = "dxvk"; rev = "v${finalAttrs.version}"; - hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8="; + hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c="; fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info }; From 59d5307caed77c8a924a8a85f7972390df1f84c0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 25 Mar 2024 14:33:28 -0400 Subject: [PATCH 13/30] dxvk: switch to Win32 thread model and cleanups - Reformat per RFC-166; - Update setup script to report on and offer to clean up obsolete mcfgthread DLL; - Switch DXVK to thread model to Win32 from MCF; and - Clean up Meson build configuration. --- pkgs/by-name/dx/dxvk/package.nix | 83 ++++++++++++++++++++-------- pkgs/by-name/dx/dxvk/setup_dxvk.sh | 89 ++++++++++++++++++++++++++---- pkgs/by-name/dx/dxvk_1/package.nix | 60 ++++++++++++-------- pkgs/by-name/dx/dxvk_2/package.nix | 56 +++++++++++-------- 4 files changed, 211 insertions(+), 77 deletions(-) diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index d3639215057f..7a8e059ecf78 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -1,38 +1,68 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, pkgsCross -, stdenv -, bash +{ + lib, + stdenvNoCC, + overrideCC, + fetchFromGitHub, + pkgsCross, + bash, }: -stdenvNoCC.mkDerivation (finalAttrs: +stdenvNoCC.mkDerivation ( + finalAttrs: let - dxvk32 = if stdenv.isDarwin - then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; } - else pkgsCross.mingw32.dxvk_2; - dxvk64 = if stdenv.isDarwin - then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; } - else pkgsCross.mingwW64.dxvk_2; + useWin32ThreadModel = + stdenv: + overrideCC stdenv ( + stdenv.cc.override (old: { + cc = old.cc.override { + threadsCross = { + model = "win32"; + package = null; + }; + }; + }) + ); + + mingw32Stdenv = useWin32ThreadModel pkgsCross.mingw32.stdenv; + mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv; + + dxvk32 = + if stdenvNoCC.isDarwin then + pkgsCross.mingw32.dxvk_1.override { + stdenv = mingw32Stdenv; + enableMoltenVKCompat = true; + } + else + pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; }; + + dxvk64 = + if stdenvNoCC.isDarwin then + pkgsCross.mingwW64.dxvk_1.override { + stdenv = mingwW64Stdenv; + enableMoltenVKCompat = true; + } + else + pkgsCross.mingwW64.dxvk_2.override { stdenv = mingwW64Stdenv; }; in { pname = "dxvk"; inherit (dxvk64) version; - outputs = [ "out" "bin" "lib" ]; + outputs = [ + "out" + "bin" + "lib" + ]; - dontUnpack = true; - dontConfigure = true; - dontBuild = true; + strictDeps = true; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $bin $lib substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \ --subst-var-by bash ${bash} \ --subst-var-by dxvk32 ${dxvk32} \ --subst-var-by dxvk64 ${dxvk64} \ - --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}" + --subst-var-by version ${finalAttrs.version} chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do @@ -41,6 +71,10 @@ stdenvNoCC.mkDerivation (finalAttrs: done ''; + passthru = { inherit dxvk32 dxvk64; }; + + __structuredAttrs = true; + meta = { description = "Setup script for DXVK"; mainProgram = "setup_dxvk.sh"; @@ -48,6 +82,11 @@ stdenvNoCC.mkDerivation (finalAttrs: changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; - platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + platforms = [ + "x86_64-darwin" + "i686-linux" + "x86_64-linux" + ]; }; - }) + } +) diff --git a/pkgs/by-name/dx/dxvk/setup_dxvk.sh b/pkgs/by-name/dx/dxvk/setup_dxvk.sh index 4926acd3ba89..27e5d6aa03d5 100644 --- a/pkgs/by-name/dx/dxvk/setup_dxvk.sh +++ b/pkgs/by-name/dx/dxvk/setup_dxvk.sh @@ -6,11 +6,9 @@ set -eu -o pipefail { dxvk32_dir=@dxvk32@/bin dxvk64_dir=@dxvk64@/bin - - mcfgthreads32_dir=@mcfgthreads32@/bin - mcfgthreads64_dir=@mcfgthreads64@/bin } + ## Defaults declare -A dlls=( @@ -18,10 +16,23 @@ declare -A dlls=( [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll" [d3d11]="dxvk/d3d11.dll" [dxgi]="dxvk/dxgi.dll" +) + +declare -A obsolete_dlls=( [mcfgthreads]="mcfgthreads/mcfgthread-12.dll" ) -declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1) +declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1) + + +# Option variables + +do_cleanup=false +ignore_obsolete=false + +do_symlink=false +do_makeprefix=false + ## Command-line Parsing @@ -46,6 +57,10 @@ usage() { } case "${1:-}" in + cleanup) + do_cleanup=true + shift + ;; uninstall|install) action=$1 shift @@ -61,10 +76,6 @@ case "${1:-}" in ;; esac - -do_symlink=false -do_makeprefix=false - while [ -n "${1:-}" ]; do case "$1" in --with-dxgi) @@ -100,6 +111,10 @@ while [ -n "${1:-}" ]; do usage fi ;; + --ignore-obsolete) + shift + ignore_obsolete=true + ;; -h|--help) usage ;; @@ -111,6 +126,7 @@ while [ -n "${1:-}" ]; do shift done + ## Get information on the Wine environment export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"} @@ -165,6 +181,7 @@ if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then exit 1 fi + ## Utility functions install_file() { @@ -200,6 +217,13 @@ install_file() { uninstall_file() { srcfile=$1 dstfile=$2 + args=$3 + + if [ "${args}" = "-f" ]; then + rm -v "${dstfile}" + [ -e "${dstfile}.old" ] && rm -v "${dstfile}.old" + return 0 + fi if [ -f "${srcfile}.so" ]; then srcfile="${srcfile}.so" @@ -239,6 +263,26 @@ uninstall_override() { fi } +print_cleanup_message() { + declare -a obsolete_paths=($@) + if ! $ignore_obsolete && [ -n "${obsolete_paths[@]}" ]; then + fold -w $COLUMNS -s <&2 +Obsolete DLLs detected at the specified Wine prefix. These DLLs are no longer needed \ +or managed by the \`setup_dxvk.sh\` script in nixpkgs. You should remove them manually, \ +use the cleanup command, or suppress this message using the \`--ignore-obsolete\` option. +MSG + for obspath in "${obsolete_paths[@]}"; do + if $do_cleanup; then + cleanup_file "$obspath" + else + echo " - ${obspath}" + fi + done + ! $do_cleanup && echo + fi +} + + ## Perform the requested command declare -A paths @@ -260,7 +304,32 @@ for target in "${!targets[@]}"; do done done -for srcpath in "${!paths[@]}"; do - "${action}_file" "$srcpath" "${paths["$srcpath"]}" +declare -A obsolete_paths + +for target in "${!obsolete_dlls[@]}"; do + for dll in ${obsolete_dlls[$target]}; do + dllname=$(basename "$dll") + basedir=$(dirname "$dll") + + if [ -e "${win32_sys_path:-}/$dllname" ]; then + obsolete_paths["${basedir}32_dir/$dllname"]="${win32_sys_path:-}/$dllname" + fi + if [ -e "${win64_sys_path:-}/$dllname" ]; then + obsolete_paths["${basedir}64_dir/$dllname"]="${win64_sys_path:-}/$dllname" + fi + done +done + +if $do_cleanup; then + declare -n action_paths=obsolete_paths + action=uninstall + args=-f +else + declare -n action_paths=paths + print_cleanup_message "${obsolete_paths[@]}" +fi + +for srcpath in "${!action_paths[@]}"; do + "${action}_file" "$srcpath" "${action_paths["$srcpath"]}" "${args:-}" "${action}_override" "$(basename "$srcpath" .dll)" done diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix index a02680d77eec..71223ecea218 100644 --- a/pkgs/by-name/dx/dxvk_1/package.nix +++ b/pkgs/by-name/dx/dxvk_1/package.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, glslang -, meson -, ninja -, windows -, pkgsBuildHost -, enableMoltenVKCompat ? false +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + glslang, + meson, + ninja, + windows, + enableMoltenVKCompat ? false, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; version = "1.10.3"; @@ -21,22 +22,35 @@ stdenv.mkDerivation (finalAttrs: { }; # These patches are required when using DXVK with Wine on Darwin. - patches = lib.optionals enableMoltenVKCompat [ - # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. - # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. - ./darwin-dxvk-compat.patch - # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. - # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ - ./darwin-thread-primitives.patch - ]; + patches = + [ + # Fixes errors building with GCC 13. + (fetchpatch { + url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch"; + hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY="; + }) + ] + ++ lib.optionals enableMoltenVKCompat [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; - nativeBuildInputs = [ glslang meson ninja ]; + strictDeps = true; + + nativeBuildInputs = [ + glslang + meson + ninja + ]; buildInputs = [ windows.pthreads ]; - mesonFlags = [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ]; + mesonBuildType = "release"; + + __structuredAttrs = true; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index 806abea0981c..a42c97a06c02 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkgsBuildHost -, glslang -, meson -, ninja -, windows -, spirv-headers -, vulkan-headers -, SDL2 -, glfw -, gitUpdater -, sdl2Support ? true -, glfwSupport ? false +{ + lib, + stdenv, + fetchFromGitHub, + pkgsBuildHost, + glslang, + meson, + ninja, + windows, + spirv-headers, + vulkan-headers, + SDL2, + glfw, + gitUpdater, + sdl2Support ? true, + glfwSupport ? false, }: # SDL2 and GLFW support are mutually exclusive. @@ -21,7 +22,7 @@ assert !sdl2Support || !glfwSupport; let isWindows = stdenv.hostPlatform.uname.system == "Windows"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; version = "2.3.1"; @@ -38,8 +39,18 @@ stdenv.mkDerivation (finalAttrs: { --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" ''; - nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ spirv-headers vulkan-headers ] + strictDeps = true; + + nativeBuildInputs = [ + glslang + meson + ninja + ]; + buildInputs = + [ + spirv-headers + vulkan-headers + ] ++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ] ++ lib.optionals (!isWindows && glfwSupport) [ glfw ] ++ lib.optionals isWindows [ windows.pthreads ]; @@ -50,15 +61,16 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p include/spirv/include include/vulkan/include ''; - mesonFlags = [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + mesonBuildType = "release"; + + mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ]; doCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + __structuredAttrs = true; + meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; homepage = "https://github.com/doitsujin/dxvk"; From a9f415a402a92bf28539dd82319d3b58a3140232 Mon Sep 17 00:00:00 2001 From: Peter Emil Jensen Date: Thu, 25 Apr 2024 19:19:32 +0200 Subject: [PATCH 14/30] prettierd: 0.25.1 -> 0.25.3 --- pkgs/development/tools/prettierd/default.nix | 6 +++--- pkgs/development/tools/prettierd/package.json | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix index 7e55e5be101a..bf7ab9e69203 100644 --- a/pkgs/development/tools/prettierd/default.nix +++ b/pkgs/development/tools/prettierd/default.nix @@ -8,18 +8,18 @@ }: mkYarnPackage rec { pname = "prettierd"; - version = "0.25.1"; + version = "0.25.3"; src = fetchFromGitHub { owner = "fsouza"; repo = "prettierd"; rev = "v${version}"; - hash = "sha256-aoRfZ9SJazz0ir1fyHypn3aYqK9DJOLLVPMuFcOm/20="; + hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-HsWsRIONRNY9akZ2LXlWcPhH6N5qCKnesaDX1gQp+NU="; + hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us="; }; packageJSON = ./package.json; diff --git a/pkgs/development/tools/prettierd/package.json b/pkgs/development/tools/prettierd/package.json index 5ba4d0980034..085e4ab73f7c 100644 --- a/pkgs/development/tools/prettierd/package.json +++ b/pkgs/development/tools/prettierd/package.json @@ -1,6 +1,6 @@ { "name": "@fsouza/prettierd", - "version": "0.25.1", + "version": "0.25.3", "description": "prettier, as a daemon", "bin": { "prettierd": "./bin/prettierd" @@ -24,13 +24,13 @@ }, "homepage": "https://github.com/fsouza/prettierd", "devDependencies": { - "@types/node": "^20.6.3", + "@types/node": "^20.12.7", "@types/prettier": "^3.0.0", - "typescript": "^5.2.2" + "typescript": "^5.4.5" }, "dependencies": { - "core_d": "^6.0.0", - "prettier": "^3.0.3" + "core_d": "^6.1.0", + "prettier": "^3.2.5" }, "files": [ "bin", @@ -39,7 +39,7 @@ "README.md" ], "optionalDependencies": { - "@babel/parser": "^7.22.16", - "@typescript-eslint/typescript-estree": "^6.7.2" + "@babel/parser": "^7.24.4", + "@typescript-eslint/typescript-estree": "^7.6.0" } } From 3f65040107745570d1f20c9bc1745fac7b1abd22 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Sat, 13 Apr 2024 10:26:32 -0700 Subject: [PATCH 15/30] pdm: fix shell completions --- pkgs/tools/package-management/pdm/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index fd8539da9654..2d252819dc02 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -94,10 +94,12 @@ buildPythonApplication rec { ''; postInstall = '' - installShellCompletion --cmd pdm \ - --bash <($out/bin/pdm completion bash) \ - --fish <($out/bin/pdm completion fish) \ - --zsh <($out/bin/pdm completion zsh) + export PDM_LOG_DIR=/tmp/pdm/log + $out/bin/pdm completion bash >pdm.bash + $out/bin/pdm completion fish >pdm.fish + $out/bin/pdm completion zsh >pdm.zsh + installShellCompletion pdm.{bash,fish,zsh} + unset PDM_LOG_DIR ''; nativeCheckInputs = [ From 258e10c02fa1a970b80e1205ebae73582de8aec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Apr 2024 03:37:21 +0000 Subject: [PATCH 16/30] python311Packages.optimum: 1.18.1 -> 1.19.1 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 1bdda5a5afa4..5c096eab5952 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.18.1"; + version = "1.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-Y+KWvpd/ULthCOr18hQjP0REQPcs2Ql2aUi3DIKIOpQ="; + hash = "sha256-EHu3p3M7xBjMnf3tKsneYOZtd9YWsC0qok1fnk4TMAg="; }; propagatedBuildInputs = [ From 87a44cc069be9f30b9b03e8510480ffb6118a4f7 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 26 Apr 2024 21:28:47 +0200 Subject: [PATCH 17/30] swaynotificationcenter: add gvfs, libnotify to buildInputs --- pkgs/applications/misc/swaynotificationcenter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index b22c483f6177..3f2310a8507f 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -12,9 +12,11 @@ , gobject-introspection , gtk-layer-shell , gtk3 +, gvfs , json-glib , libgee , libhandy +, libnotify , libpulseaudio , librsvg , meson @@ -65,9 +67,11 @@ stdenv.mkDerivation (finalAttrs: rec { glib gtk-layer-shell gtk3 + gvfs json-glib libgee libhandy + libnotify libpulseaudio librsvg pantheon.granite From 8feccaf0eac40d74f25f3af64c0422f091ed2513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Apr 2024 23:21:45 +0000 Subject: [PATCH 18/30] cdxgen: 10.3.5 -> 10.4.3 --- pkgs/tools/security/cdxgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 3558dd6553ff..c9d962ed47af 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "10.3.5"; + version = "10.4.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tpmx94pQq7lqDvTtPY0chwcwAMmydkFFv2IlXb+q8EU="; + sha256 = "sha256-m6AtAbsZ7zPu7MlwEt9+RBs11DAHNa3x0Nn7b3TWdAY="; }; - npmDepsHash = "sha256-V7eLhscu7gTLtfq0OI3yCfT5Xlkbj54WrgOM6WUArTU="; + npmDepsHash = "sha256-z7tBghs2bg2eYNRkhe9J8/0rqaAXV5e5ZT9u5fdABe0="; dontNpmBuild = true; From 60cec04ec7e5e66af7df870dcc8139b4c4f9eb9b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 Apr 2024 10:43:57 +0200 Subject: [PATCH 19/30] taler: move to pkgs/by-name --- .../applications/networking/taler/default.nix | 147 ------------------ pkgs/by-name/ta/taler-exchange/package.nix | 104 +++++++++++++ pkgs/by-name/ta/taler-merchant/package.nix | 88 +++++++++++ pkgs/top-level/all-packages.nix | 3 - 4 files changed, 192 insertions(+), 150 deletions(-) delete mode 100644 pkgs/applications/networking/taler/default.nix create mode 100644 pkgs/by-name/ta/taler-exchange/package.nix create mode 100644 pkgs/by-name/ta/taler-merchant/package.nix diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix deleted file mode 100644 index babdff54f185..000000000000 --- a/pkgs/applications/networking/taler/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd -, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql -, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo -}: - -let - version = "0.10.1"; - - taler-wallet-core = fetchgit { - url = "https://git.taler.net/wallet-core.git"; - rev = "v${version}"; - hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY="; - }; - - taler-exchange = stdenv.mkDerivation { - pname = "taler-exchange"; - inherit version; - - src = fetchgit { - url = "https://git.taler.net/exchange.git"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg="; - - # When fetching submodules without the .git folder we get the following error: - # "Server does not allow request for unadvertised object" - leaveDotGit = true; - postFetch = '' - rm -rf $out/.git - ''; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - libgcrypt - libmicrohttpd - jansson - libsodium - postgresql - curl - recutils - gettext - texinfo # Fix 'makeinfo' is missing on your system. - libunistring - python3.pkgs.jinja2 - # jq is necessary for some tests and is checked by configure script - jq - ]; - propagatedBuildInputs = [ gnunet ]; - - # From ./bootstrap - preAutoreconf = '' - ./contrib/gana-generate.sh - pushd contrib - find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext - truncate -s -2 Makefile.am.ext - cat Makefile.am.in Makefile.am.ext >> Makefile.am - popd - ''; - - enableParallelBuilding = true; - - nativeCheckInputs = [ wget curl ]; - doInstallCheck = true; - checkTarget = "check"; - - meta = with lib; { - description = '' - Taler is an electronic payment system providing the ability to pay - anonymously using digital cash. Taler consists of a network protocol - definition (using a RESTful API over HTTP), a Exchange (which creates - digital coins), a Wallet (which allows customers to manage, store and - spend digital coins), and a Merchant website which allows customers to - spend their digital coins. Naturally, each Merchant is different, but - Taler includes code examples to help Merchants integrate Taler as a - payment system. - ''; - homepage = "https://taler.net/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; - }; - }; - - taler-merchant = stdenv.mkDerivation { - pname = "taler-merchant"; - inherit version; - - src = fetchgit { - url = "https://git.taler.net/merchant.git"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y="; - }; - postUnpack = '' - ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = taler-exchange.buildInputs ++ [ - qrencode - taler-exchange - # for ltdl.h - libtool - ]; - propagatedBuildInputs = [ gnunet ]; - - # From ./bootstrap - preAutoreconf = '' - pushd contrib - find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext - truncate -s -2 Makefile.am.ext - cat Makefile.am.in Makefile.am.ext >> Makefile.am - popd - ''; - configureFlags = [ - "--with-gnunet=${gnunet}" - "--with-exchange=${taler-exchange}" - ]; - - enableParallelBuilding = true; - - nativeCheckInputs = [ jq ]; - doInstallCheck = true; - checkTarget = "check"; - - meta = with lib; { - description = '' - This is the GNU Taler merchant backend. It provides the logic that should run - at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that - can be used to setup orders and process payments. This component allows - merchants to receive payments without invading the customers' privacy. Of - course, this applies mostly for digital goods, as the merchant does not need - to know the customer's physical address. - ''; - homepage = "https://taler.net/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; - }; - }; -in { - inherit taler-exchange taler-merchant; -} diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix new file mode 100644 index 000000000000..e077b3d7d10b --- /dev/null +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchgit, + curl, + gnunet, + jansson, + libgcrypt, + libmicrohttpd, + libsodium, + libunistring, + pkg-config, + postgresql, + autoreconfHook, + python3, + recutils, + wget, + jq, + gettext, + texinfo, +}: + +let + version = "0.10.1"; +in +stdenv.mkDerivation { + pname = "taler-exchange"; + inherit version; + + src = fetchgit { + url = "https://git.taler.net/exchange.git"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg="; + + # When fetching submodules without the .git folder we get the following error: + # "Server does not allow request for unadvertised object" + leaveDotGit = true; + postFetch = '' + rm -rf $out/.git + ''; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libgcrypt + libmicrohttpd + jansson + libsodium + postgresql + curl + recutils + gettext + texinfo # Fix 'makeinfo' is missing on your system. + libunistring + python3.pkgs.jinja2 + # jq is necessary for some tests and is checked by configure script + jq + ]; + + propagatedBuildInputs = [ gnunet ]; + + # From ./bootstrap + preAutoreconf = '' + ./contrib/gana-generate.sh + pushd contrib + find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + popd + ''; + + enableParallelBuilding = true; + + doInstallCheck = true; + + nativeCheckInputs = [ + wget + curl + ]; + + checkTarget = "check"; + + meta = with lib; { + description = '' + Taler is an electronic payment system providing the ability to pay + anonymously using digital cash. Taler consists of a network protocol + definition (using a RESTful API over HTTP), a Exchange (which creates + digital coins), a Wallet (which allows customers to manage, store and + spend digital coins), and a Merchant website which allows customers to + spend their digital coins. Naturally, each Merchant is different, but + Taler includes code examples to help Merchants integrate Taler as a + payment system. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix new file mode 100644 index 000000000000..d416845fe129 --- /dev/null +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchgit, + gnunet, + qrencode, + taler-exchange, + libtool, + pkg-config, + autoreconfHook, + jq, +}: + +let + version = "0.10.1"; + + taler-wallet-core = fetchgit { + url = "https://git.taler.net/wallet-core.git"; + rev = "v${version}"; + hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY="; + }; +in +stdenv.mkDerivation { + pname = "taler-merchant"; + inherit version; + + src = fetchgit { + url = "https://git.taler.net/merchant.git"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y="; + }; + + postUnpack = '' + ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ + ''; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = taler-exchange.buildInputs ++ [ + qrencode + taler-exchange + # for ltdl.h + libtool + ]; + + propagatedBuildInputs = [ gnunet ]; + + # From ./bootstrap + preAutoreconf = '' + pushd contrib + find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + popd + ''; + + configureFlags = [ + "--with-gnunet=${gnunet}" + "--with-exchange=${taler-exchange}" + ]; + + enableParallelBuilding = true; + + doInstallCheck = true; + + nativeCheckInputs = [ jq ]; + + checkTarget = "check"; + + meta = with lib; { + description = '' + This is the GNU Taler merchant backend. It provides the logic that should run + at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that + can be used to setup orders and process payments. This component allows + merchants to receive payments without invading the customers' privacy. Of + course, this applies mostly for digital goods, as the merchant does not need + to know the customer's physical address. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c5051bdf790..d6b91e747854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13525,9 +13525,6 @@ with pkgs; tailer = callPackage ../tools/misc/tailer { }; - inherit (callPackages ../applications/networking/taler { }) - taler-exchange taler-merchant; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; tango = callPackage ../applications/misc/tango { }; From 05e431edce4a5c3ac1b28c29ef0f9455b96eb581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 14:54:56 +0000 Subject: [PATCH 20/30] quarkus: 3.9.4 -> 3.9.5 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 5e6faa4316ba..3a0528e6693e 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.9.4"; + version = "3.9.5"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-ez4D+czYDhs/GNrjRF8Bx999JRW0EigMxc39fOH54V8="; + hash = "sha256-3vcuf49gutlXbFT5mUuZw9fDjyvb0Q+lXyn4n+RcLdU="; }; nativeBuildInputs = [ makeWrapper ]; From e2f0308200e34a4b48a417856ab4a890d4a5ad39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 14:55:07 +0000 Subject: [PATCH 21/30] pinentry-bemenu: 0.13.1 -> 0.13.2 --- pkgs/tools/security/pinentry-bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix index 36fff7d34d5c..65e7a88bcfbb 100644 --- a/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/pkgs/tools/security/pinentry-bemenu/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pinentry-bemenu"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "t-8ch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h+PC8IGwCW5ZroLGpypcmpejOo+JGM7zG4N5fguBWvM="; + sha256 = "sha256-m6P8/cCdGH2c9ne8aLrh6pUJ6Ekn+CNyEn3WlD2LhU8="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 25a543ec4988c2d2a3bfd32035a4d573d02ffb22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 15:08:50 +0000 Subject: [PATCH 22/30] xpipe: 8.6 -> 9.0 --- pkgs/applications/networking/xpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index 9798ca228330..c986b4a62455 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A="; + x86_64-linux = "sha256-3KMmMDoaYYMKuuqLof/LfdCs1d4I70L2TDxmzvx4Vq0="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "8.6"; + version = "9.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From 6512417588f62ce8647516bd55bd9ea56b8d64d2 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 27 Apr 2024 12:35:19 -0400 Subject: [PATCH 23/30] makemkv: reformat according to RFC166 --- pkgs/applications/video/makemkv/default.nix | 56 +++++++++++++-------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index b98c48fbe169..cb6dca1322a1 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,16 +1,17 @@ -{ lib -, mkDerivation -, fetchurl -, autoPatchelfHook -, pkg-config -, curl -, ffmpeg -, openssl -, qtbase -, zlib +{ + lib, + mkDerivation, + fetchurl, + autoPatchelfHook, + pkg-config, + curl, + ffmpeg, + openssl, + qtbase, + zlib, -, withJava ? true -, jre_headless + withJava ? true, + jre_headless, }: let @@ -30,12 +31,15 @@ let ]; sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM="; }; - -in mkDerivation { +in +mkDerivation { pname = "makemkv"; inherit version; - srcs = [ src_bin src_oss ]; + srcs = [ + src_bin + src_oss + ]; sourceRoot = "makemkv-oss-${version}"; @@ -43,18 +47,25 @@ in mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ autoPatchelfHook pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; - buildInputs = [ ffmpeg openssl qtbase zlib ]; + buildInputs = [ + ffmpeg + openssl + qtbase + zlib + ]; runtimeDependencies = [ (lib.getLib curl) ]; qtWrapperArgs = let binPath = lib.makeBinPath [ jre_headless ]; - in lib.optionals withJava [ - "--prefix PATH : ${binPath}" - ]; + in + lib.optionals withJava [ "--prefix PATH : ${binPath}" ]; installPhase = '' runHook preInstall @@ -84,7 +95,10 @@ in mkDerivation { expiration date. ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = [ licenses.unfree licenses.lgpl21 ]; + license = [ + licenses.unfree + licenses.lgpl21 + ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ]; From bd10b937ff3ea17425d8b4d21d35860fd8d7d706 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sat, 27 Apr 2024 12:35:40 -0400 Subject: [PATCH 24/30] makemkv: add jchw to maintainers --- pkgs/applications/video/makemkv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index cb6dca1322a1..261e8008f6bc 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -101,6 +101,6 @@ mkDerivation { ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jchw ]; }; } From 05acad93d3c764eb3e7a21ff1b907b14f22ad585 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 22:57:53 +0200 Subject: [PATCH 25/30] step-ca: 0.25.2 -> 0.26.1 Diff: https://github.com/smallstep/certificates/compare/refs/tags/v0.25.2...v0.26.1 Changelog: https://github.com/smallstep/certificates/releases/tag/v0.26.1 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 6bdbfa02d62a..154082b98831 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.25.2"; + version = "0.26.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-cP3QypBNWGbr7R7lJLfaoBh6C37ubGuaxnxWlZ1Z000="; + hash = "sha256-yej7gzhaUPbcvqbse7Hh7Im38+DUfC9UZkpjpuG8ctk="; }; - vendorHash = "sha256-AXMMpzXEhdKSGeVg/KK2NEgalxIXP6DUTcoxOQVqow4="; + vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4="; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config From d3f38e70bdd8cb171b992356f269f6dcf32701f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Apr 2024 22:59:06 +0200 Subject: [PATCH 26/30] step-ca: format with nixfmt --- pkgs/tools/security/step-ca/default.nix | 31 ++++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 154082b98831..72f80c3c79ea 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, buildGoModule -, coreutils -, pcsclite -, PCSC -, pkg-config -, hsmSupport ? true -, nixosTests +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + coreutils, + pcsclite, + PCSC, + pkg-config, + hsmSupport ? true, + nixosTests, }: buildGoModule rec { @@ -23,9 +24,7 @@ buildGoModule rec { vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4="; - nativeBuildInputs = lib.optionals hsmSupport [ - pkg-config - ]; + nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; buildInputs = lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ] @@ -62,6 +61,10 @@ buildGoModule rec { homepage = "https://smallstep.com/certificates/"; changelog = "https://github.com/smallstep/certificates/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai mohe2015 techknowlogick ]; + maintainers = with maintainers; [ + cmcdragonkai + mohe2015 + techknowlogick + ]; }; } From f0561ffed1da376bf953471fa574755488576a3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 20:59:22 +0000 Subject: [PATCH 27/30] grype: 0.77.0 -> 0.77.1 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 7d9a7b4bc02b..645c9cadb4fc 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.0"; + version = "0.77.1"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-EnAMAmoP8rbkOkdPPxkN14lOPVYPqVpmaekfXBboeyI="; + hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y="; + vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk="; nativeBuildInputs = [ installShellFiles ]; From c8b58703dfd7db9884f3291dba9b94f19d80d376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 23:46:25 +0000 Subject: [PATCH 28/30] xjadeo: 0.8.13 -> 0.8.14 --- pkgs/tools/video/xjadeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index 3774e0a100bf..01cb2c997913 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "xjadeo"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "x42"; repo = "xjadeo"; rev = "v${version}"; - sha256 = "sha256-CSq11hFNmo41VXOndBoPxRc9NNUUBtzfWx14DCUFieQ="; + sha256 = "sha256-GTg0W3D0BRSxsmeVsB4On3MfwncScEGFJGVJK7wflCM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 396177a40e2322ec5b0a5e697eab9eb193259f76 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 31 Aug 2023 17:26:38 +0900 Subject: [PATCH 29/30] parallel-hashmap: init at 1.3.12 --- pkgs/by-name/pa/parallel-hashmap/package.nix | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/pa/parallel-hashmap/package.nix diff --git a/pkgs/by-name/pa/parallel-hashmap/package.nix b/pkgs/by-name/pa/parallel-hashmap/package.nix new file mode 100644 index 000000000000..767b760c920a --- /dev/null +++ b/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "parallel-hashmap"; + version = "1.3.12"; + + src = fetchFromGitHub { + owner = "greg7mdp"; + repo = "parallel-hashmap"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0="; + }; + + postPatch = '' + # don't download googletest, but build it from source + # https://github.com/greg7mdp/parallel-hashmap/blob/be6a2c79857c9ea76760ca6ce782e1609713428e/CMakeLists.txt#L98 + substituteInPlace CMakeLists.txt \ + --replace "include(cmake/DownloadGTest.cmake)" "add_subdirectory(${gtest.src} ./googletest-build EXCLUDE_FROM_ALL)" + ''; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DPHMAP_BUILD_EXAMPLES=OFF" + ]; + + nativeCheckInputs = [ + gtest + ]; + + doCheck = true; + + meta = with lib; { + description = "A family of header-only, very fast and memory-friendly hashmap and btree containers"; + homepage = "https://github.com/greg7mdp/parallel-hashmap"; + changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ natsukium ]; + }; +}) From 6977b4dcff4083c28f8bf78a11e7848e9b2f10ac Mon Sep 17 00:00:00 2001 From: IBeTheBlueCat <93213509+IBeTheBlueCat@users.noreply.github.com> Date: Sun, 28 Apr 2024 03:47:24 +0100 Subject: [PATCH 30/30] nixos/doc: fix typo in abstractions.section.md (#305836) I found this while perusing the manual thinking about whether or not to install NixOS on my new laptop. It threw me for a loop for a second but as best I can tell this meant to be ".org" like the rest of the example, and not ".com" --- nixos/doc/manual/configuration/abstractions.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md index 5bc44aa72245..06356c472ba9 100644 --- a/nixos/doc/manual/configuration/abstractions.section.md +++ b/nixos/doc/manual/configuration/abstractions.section.md @@ -35,7 +35,7 @@ in { services.httpd.virtualHosts = { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); - "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); + "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; }); }; } ```