From 2422a6553991263c9a5fffec4f38ea6986ee61d9 Mon Sep 17 00:00:00 2001 From: Francesco Noacco Date: Tue, 9 Apr 2024 21:41:52 +0200 Subject: [PATCH 01/90] astartectl: 23.5.0 -> 23.5.1 --- pkgs/by-name/as/astartectl/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index 3027c78984b2..4dcd046570e9 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -5,16 +5,20 @@ }: buildGoModule rec { pname = "astartectl"; - version = "23.5.0"; + version = "23.5.1"; + + # Workaround for go vendor failing + # https://github.com/astarte-platform/astartectl/pull/244 + postPatch = "go mod edit -go=1.22"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-4NgDVuYEeJI5Arq+/+xdyUOBWdCLALM3EKVLSFimJlI="; + hash = "sha256-ntlLk7soiZq6Ql6k/RG9PdHawguRV6Wha8C+5FM+2og="; }; - vendorHash = "sha256-Syod7SUsjiM3cdHPZgjH/3qdsiowa0enyV9DN8k13Ws="; + vendorHash = "sha256-3k/G7fLll19XG2RU8YsepWv8BtkCmiLg4/c7lSvx+9k="; nativeBuildInputs = [ installShellFiles ]; From fe516ada1d74e6af0d3b8a9feb20b6f97c03bd6e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 21 Apr 2024 13:45:08 +0200 Subject: [PATCH 02/90] gcs: format with nixfmt --- pkgs/by-name/gc/gcs/package.nix | 82 ++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 1493836491af..2dc0864c3927 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -1,21 +1,22 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, moreutils -, libGL -, libX11 -, libXcursor -, libXrandr -, libXinerama -, libXi -, libXxf86vm -, mupdf -, fontconfig -, freetype -, stdenv -, darwin -, nix-update-script +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + moreutils, + libGL, + libX11, + libXcursor, + libXrandr, + libXinerama, + libXi, + libXxf86vm, + mupdf, + fontconfig, + freetype, + stdenv, + darwin, + nix-update-script, }: buildGoModule rec { @@ -36,28 +37,37 @@ buildGoModule rec { vendorHash = "sha256-ee6qvwnUXtsBcovPOORfVpdndICtIUYe4GrP52V/P3k="; - nativeBuildInputs = [ pkg-config moreutils ]; - - buildInputs = [ - libGL - libX11 - libXcursor - libXrandr - libXinerama - libXi - libXxf86vm - mupdf - fontconfig - freetype - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Carbon - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.Kernel + nativeBuildInputs = [ + pkg-config + moreutils ]; + buildInputs = + [ + libGL + libX11 + libXcursor + libXrandr + libXinerama + libXi + libXxf86vm + mupdf + fontconfig + freetype + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Carbon + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Kernel + ]; + # flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh flags = [ "-a" ]; - ldflags = [ "-s" "-w" "-X github.com/richardwilkes/toolbox/cmdline.AppVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/richardwilkes/toolbox/cmdline.AppVersion=${version}" + ]; installPhase = '' runHook preInstall From 4903f64bcddf766edf72fbc9f496e95a8e59f0ba Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:31:08 +0200 Subject: [PATCH 03/90] gcs: 5.20.4 -> 5.21.0 --- pkgs/by-name/gc/gcs/package.nix | 36 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix index 2dc0864c3927..e8d9a337f04a 100644 --- a/pkgs/by-name/gc/gcs/package.nix +++ b/pkgs/by-name/gc/gcs/package.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, + buildNpmPackage, fetchFromGitHub, pkg-config, - moreutils, libGL, libX11, libXcursor, @@ -16,18 +16,17 @@ freetype, stdenv, darwin, - nix-update-script, }: buildGoModule rec { pname = "gcs"; - version = "5.20.4"; + version = "5.21.0"; src = fetchFromGitHub { owner = "richardwilkes"; repo = "gcs"; rev = "v${version}"; - hash = "sha256-aoU2wRz2XB6+3e6am/dLjRbcDmWTjtDtTBwc6c4n3DE="; + hash = "sha256-mes1aXh4R1re4sW3xYDWtSIcW7lwkWoAxbcbdyT/W+o="; }; modPostBuild = '' @@ -35,12 +34,29 @@ buildGoModule rec { sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go ''; - vendorHash = "sha256-ee6qvwnUXtsBcovPOORfVpdndICtIUYe4GrP52V/P3k="; + vendorHash = "sha256-H5GCrrqmDwpCneXawu7kZsRfrQ8hcsbqhpAAG6FCawg="; - nativeBuildInputs = [ - pkg-config - moreutils - ]; + frontend = buildNpmPackage { + name = "${pname}-${version}-frontend"; + + inherit src; + sourceRoot = "${src.name}/server/frontend"; + + npmDepsHash = "sha256-wP6sjdcjljzmTs0GUMbF2BPo83LKpfdn15sUuMEIn6E="; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r dist $out/dist + runHook postInstall + ''; + }; + + postPatch = '' + cp -r ${frontend}/dist server/frontend/dist + ''; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -75,8 +91,6 @@ buildGoModule rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; - meta = { changelog = "https://github.com/richardwilkes/gcs/releases/tag/${src.rev}"; description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; From 0d015895debd63b937f1b3ee10cb3a73aa180a8f Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Fri, 5 Apr 2024 08:42:30 +0200 Subject: [PATCH 04/90] nixos/test-driver: separate the subtest log call We do not use the generic "nested" function but introduce a separate subtest log call. This will later allow us to track subtests and account logs to specific subtests. --- nixos/lib/test-driver/test_driver/driver.py | 2 +- nixos/lib/test-driver/test_driver/logger.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index f792c0459199..7dfbfdcf1c2a 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -99,7 +99,7 @@ class Driver: def subtest(self, name: str) -> Iterator[None]: """Group logs under a given test name""" - with rootlog.nested("subtest: " + name): + with rootlog.subtest(name): try: yield return True diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 0b0623bddfa1..1b802f992f64 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -79,6 +79,11 @@ class Logger: except Empty: pass + @contextmanager + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + with self.nested("subtest: " + name, attributes): + yield + @contextmanager def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: self._eprint( From c2c525f5bcf44918f43b00f8424c30b56f1ac73b Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Tue, 2 Apr 2024 14:30:52 +0200 Subject: [PATCH 05/90] nixos/test-driver: add junit-xml python package --- nixos/lib/test-driver/default.nix | 1 + nixos/lib/test-driver/pyproject.toml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 1acdaacc4e65..7e1d0ad70d7d 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication { coreutils netpbm python3Packages.colorama + python3Packages.junit-xml python3Packages.ptpython qemu_pkg socat diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/pyproject.toml index 17b7130a4bad..9d9ff7c0a97b 100644 --- a/nixos/lib/test-driver/pyproject.toml +++ b/nixos/lib/test-driver/pyproject.toml @@ -31,6 +31,10 @@ ignore_missing_imports = true module = "ptpython.*" ignore_missing_imports = true +[[tool.mypy.overrides]] +module = "junit_xml.*" +ignore_missing_imports = true + [tool.black] line-length = 88 target-version = ['py39'] From a6160e576347358db79071cf2e4ee5dc623ce7ec Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Mon, 8 Apr 2024 12:10:19 +0200 Subject: [PATCH 06/90] nixos/test-driver: use function instead of var Use a proper function to enable serial log printing instead of setting class member variables directly. --- nixos/lib/test-driver/test_driver/driver.py | 4 ++-- nixos/lib/test-driver/test_driver/logger.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 7dfbfdcf1c2a..0650acb4d897 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -249,10 +249,10 @@ class Driver: ) def serial_stdout_on(self) -> None: - rootlog._print_serial_logs = True + rootlog.print_serial_logs(True) def serial_stdout_off(self) -> None: - rootlog._print_serial_logs = False + rootlog.print_serial_logs(False) def check_polling_conditions(self) -> None: for condition in self.polling_conditions: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 1b802f992f64..77a9b81c5946 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -24,6 +24,9 @@ class Logger: self._print_serial_logs = True + def print_serial_logs(self, enable: bool) -> None: + self._print_serial_logs = enable + @staticmethod def _eprint(*args: object, **kwargs: Any) -> None: print(*args, file=sys.stderr, **kwargs) From ab2517c9bc05f413f8d6774d0d1e7b1dc0a5ba61 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Wed, 13 Dec 2023 18:33:32 +0300 Subject: [PATCH 07/90] gr-framework: 0.72.11 -> 0.73.5 --- .../gr/gr-framework/package.nix} | 13 +++++----- ...de-to-search-for-the-LibXml2-package.patch | 25 +++++++++++++++++++ ...de-to-search-for-the-LibXml2-package.patch | 25 ------------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 32 insertions(+), 33 deletions(-) rename pkgs/{development/libraries/gr-framework/default.nix => by-name/gr/gr-framework/package.nix} (81%) create mode 100644 pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch delete mode 100644 pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch diff --git a/pkgs/development/libraries/gr-framework/default.nix b/pkgs/by-name/gr/gr-framework/package.nix similarity index 81% rename from pkgs/development/libraries/gr-framework/default.nix rename to pkgs/by-name/gr/gr-framework/package.nix index 2157a18f58d1..533391a9504e 100644 --- a/pkgs/development/libraries/gr-framework/default.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -2,9 +2,9 @@ , stdenv , fetchFromGitHub , nix-update-script +, qt5 , cmake -, wrapQtAppsHook , cairo , ffmpeg @@ -14,29 +14,28 @@ , libjpeg , libtiff , qhull -, qtbase , xorg , zeromq }: stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.72.11"; + version = "0.73.5"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-HspDRqO/JKpPeHOfctYAOwwR3y1u+GW3v0OnN7OfLT4="; + hash = "sha256-9Py2r774GaUXWhF3yO3ceT1rPi/uqMVZVAo0xs9n+I0="; }; patches = [ - ./Use-the-module-mode-to-search-for-the-LibXml2-package.patch + ./patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { libjpeg libtiff qhull - qtbase + qt5.qtbase xorg.libX11 xorg.libXft xorg.libXt diff --git a/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch b/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch new file mode 100644 index 000000000000..41fdcd5ae72b --- /dev/null +++ b/pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch @@ -0,0 +1,25 @@ +From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev +Date: Wed, 31 Jan 2024 16:50:36 +0000 +Subject: [PATCH] Use the module mode to search for the `LibXml2` package. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5f865a5b..5550b493 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ if(GR_USE_BUNDLED_LIBRARIES) + # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file) + find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH) + else() +- find_package(LibXml2 NO_MODULE) ++ find_package(LibXml2 MODULE) + endif() + + # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set +-- +2.42.0 + diff --git a/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch b/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch deleted file mode 100644 index b472d7271e8d..000000000000 --- a/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5d2377ad5e99742662e056bb782d5c21afb01dfb Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Tue, 19 Sep 2023 13:27:39 +0300 -Subject: [PATCH] Use the module mode to search for the `LibXml2` package. - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03490335..fb69e8fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -96,7 +96,7 @@ find_package(Expat) - # CMake ships with a `FindLibXml2.cmake` module which does not configure needed libxml2 dependencies. - # Thus, use the `libxml2-config.cmake` config file shipped with libxml which configures dependencies correctly by - # skipping module search mode. --find_package(LibXml2 NO_MODULE) -+find_package(LibXml2 MODULE) - if(${CMAKE_VERSION} VERSION_GREATER "3.16.0") - find_package( - Qt6 --- -2.42.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0132d21f569a..bb9d4f517066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21029,7 +21029,7 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; - gr-framework = libsForQt5.callPackage ../development/libraries/gr-framework { + gr-framework = callPackage ../by-name/gr/gr-framework/package.nix { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; From 1d2d850e72c0279cc1dc53208b490c35ff5c4b25 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Mon, 6 May 2024 10:06:54 +0800 Subject: [PATCH 08/90] wechat-uos: 1.0.0.238 -> 1.0.0.241 --- pkgs/by-name/we/wechat-uos/package.nix | 18 +++++--- pkgs/by-name/we/wechat-uos/sources.nix | 11 +++++ pkgs/by-name/we/wechat-uos/update.sh | 60 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/we/wechat-uos/sources.nix create mode 100644 pkgs/by-name/we/wechat-uos/update.sh diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 0fd6dbd8ea0b..5a794cde2a34 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -169,23 +169,25 @@ let bzip2 ]; + sources = import ./sources.nix; + wechat = stdenvNoCC.mkDerivation rec { pname = "wechat-uos"; - version = "1.0.0.238"; + version = sources.version; src = { x86_64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_${version}_amd64.deb"; - hash = "sha256-NxAmZ526JaAzAjtAd9xScFnZBuwD6i2wX2/AEqtAyWs="; + url = sources.amd64_url; + hash = sources.amd64_hash; }; aarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_${version}_arm64.deb"; - hash = "sha256-3ru6KyBYXiuAlZuWhyyvtQCWbOJhGYzker3FS0788RE="; + url = sources.arm64_url; + hash = sources.arm64_hash; }; loongarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_${version}_loongarch64.deb"; - hash = "sha256-iuJeLMKD6v8J8iKw3+cyODN7PZQrLpi9p0//mkI0ujE="; + url = sources.loongarch64_url; + hash = sources.loongarch64_hash; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -273,5 +275,7 @@ buildFHSEnv { ''; targetPkgs = pkgs: [ wechat-uos-env ]; + passthru.updateScript = ./update.sh; + extraOutputsToInstall = [ "usr" "var/lib/uos" "var/uos" "etc" ]; } diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix new file mode 100644 index 000000000000..3d5590de6416 --- /dev/null +++ b/pkgs/by-name/we/wechat-uos/sources.nix @@ -0,0 +1,11 @@ +# Generated by ./update.sh - do not update manually! +# Last updated: 2024-05-06 +{ + version = "1.0.0.241"; + amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_amd64.deb"; + arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_arm64.deb"; + loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.241_loongarch64.deb"; + amd64_hash = "sha256-J2ipc3byBzvVFe+B1k+nsgZo+mwRpBd6LtF/ybAzmKM="; + arm64_hash = "sha256-5KA4ekhVdXoin/7VhuMbG8XIlx0w7vHAedZ1fnBOBYo="; + loongarch64_hash = "sha256-kMMnb9jjOOtQFivLDu+aQctVMYeFHQ1fNg49AQE4yLk="; +} diff --git a/pkgs/by-name/we/wechat-uos/update.sh b/pkgs/by-name/we/wechat-uos/update.sh new file mode 100644 index 000000000000..8797c5132395 --- /dev/null +++ b/pkgs/by-name/we/wechat-uos/update.sh @@ -0,0 +1,60 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git gzip + +base_url_suffix="https://pro-store-packages.uniontech.com/appstore/dists/eagle/appstore/binary-" +base_url_appendix="/Packages.gz" +target_package="com.tencent.wechat" +packages_file="Packages.gz" + +url=() +version=() # TODO: Currently, there is no version differences between archs. This is reserved for future use. +hash=() + +for i in amd64 arm64 loongarch64 +do + current_url=$base_url_suffix$i$base_url_appendix + curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:125.0) Gecko/20100101 Firefox/125.0" -v -L -O $current_url + current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" ' + BEGIN { found = 0 } + { + if ($0 ~ "^Package: "pkg) { + found = 1; + } + if (found && $1 == "Version:") { + print $2; + exit; + } + } + ') + version+=("$current_version") + sha256sum=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" ' + BEGIN { found = 0 } + { + if ($0 ~ "^Package: "pkg) { + found = 1; + } + if (found && $1 == "SHA256:") { + print $2; + exit; + } + } + ') + url+=("https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_"$version"_"$i".deb") + hash+=("$(nix hash to-sri --type sha256 $sha256sum)") +done + +cat >sources.nix < Date: Thu, 2 May 2024 18:43:51 +0200 Subject: [PATCH 09/90] dummyhttp: init at 1.0.3 --- pkgs/by-name/du/dummyhttp/package.nix | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/du/dummyhttp/package.nix diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix new file mode 100644 index 000000000000..433649629cb0 --- /dev/null +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, darwin +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "dummyhttp"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "svenstaro"; + repo = "dummyhttp"; + rev = "v${version}"; + hash = "sha256-MDkyJAVNpCaAomAEweYrQeQWtil8bYo34ko9rAu+VBU="; + }; + + cargoHash = "sha256-JkA0qW/MQH+XmiD9eiT0s70HxNNYyk9ecBo4k5nUF10="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Super simple HTTP server that replies a fixed body with a fixed response code"; + homepage = "https://github.com/svenstaro/dummyhttp"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ GuillaumeDesforges ]; + mainProgram = "dummyhttp"; + }; +} + From b505db6f6df1f67ba437e60d7070a8f6698f6113 Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Mon, 8 Apr 2024 15:41:33 +0200 Subject: [PATCH 10/90] nixos/test-driver: add AbstractLogger interface --- nixos/lib/test-driver/test_driver/logger.py | 41 ++++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 77a9b81c5946..14c5b1033dd5 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -3,6 +3,7 @@ import os import sys import time import unicodedata +from abc import ABC, abstractmethod from contextlib import contextmanager from queue import Empty, Queue from typing import Any, Dict, Iterator @@ -12,7 +13,43 @@ from xml.sax.xmlreader import AttributesImpl from colorama import Fore, Style -class Logger: +class AbstractLogger(ABC): + @abstractmethod + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: + pass + + @abstractmethod + @contextmanager + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + pass + + @abstractmethod + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + pass + + @abstractmethod + def info(self, *args, **kwargs) -> None: # type: ignore + pass + + @abstractmethod + def warning(self, *args, **kwargs) -> None: # type: ignore + pass + + @abstractmethod + def error(self, *args, **kwargs) -> None: # type: ignore + pass + + @abstractmethod + def log_serial(self, message: str, machine: str) -> None: + pass + + @abstractmethod + def print_serial_logs(self, enable: bool) -> None: + pass + + +class Logger(AbstractLogger): def __init__(self) -> None: self.logfile = os.environ.get("LOGFILE", "/dev/null") self.logfile_handle = codecs.open(self.logfile, "wb") @@ -110,4 +147,4 @@ class Logger: self.xml.endElement("nest") -rootlog = Logger() +rootlog: AbstractLogger = Logger() From 9d90df51a9cdfaee321216997a0413c85672545f Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Mon, 8 Apr 2024 16:17:06 +0200 Subject: [PATCH 11/90] nixos/test-driver: Separate XML and Terminal log We use the newly AbstractLogger class and separate the XML and Terminal logging that is currently mixed into one class. We restore the old behavior by introducing a CompositeLogger that takes care of logging both to terminal and XML. --- nixos/lib/test-driver/test_driver/logger.py | 137 ++++++++++++++++---- nixos/lib/test-script-prepend.py | 4 +- 2 files changed, 116 insertions(+), 25 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 14c5b1033dd5..f50e3b78a828 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -4,9 +4,9 @@ import sys import time import unicodedata from abc import ABC, abstractmethod -from contextlib import contextmanager +from contextlib import ExitStack, contextmanager from queue import Empty, Queue -from typing import Any, Dict, Iterator +from typing import Any, Dict, Iterator, List from xml.sax.saxutils import XMLGenerator from xml.sax.xmlreader import AttributesImpl @@ -49,24 +49,117 @@ class AbstractLogger(ABC): pass -class Logger(AbstractLogger): +class CompositeLogger(AbstractLogger): + def __init__(self, logger_list: List[AbstractLogger]) -> None: + self.logger_list = logger_list + + def add_logger(self, logger: AbstractLogger) -> None: + self.logger_list.append(logger) + + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: + for logger in self.logger_list: + logger.log(message, attributes) + + @contextmanager + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + with ExitStack() as stack: + for logger in self.logger_list: + stack.enter_context(logger.subtest(name, attributes)) + yield + + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + with ExitStack() as stack: + for logger in self.logger_list: + stack.enter_context(logger.nested(message, attributes)) + yield + + def info(self, *args, **kwargs) -> None: # type: ignore + for logger in self.logger_list: + logger.info(*args, **kwargs) + + def warning(self, *args, **kwargs) -> None: # type: ignore + for logger in self.logger_list: + logger.warning(*args, **kwargs) + + def error(self, *args, **kwargs) -> None: # type: ignore + for logger in self.logger_list: + logger.error(*args, **kwargs) + sys.exit(1) + + def print_serial_logs(self, enable: bool) -> None: + for logger in self.logger_list: + logger.print_serial_logs(enable) + + def log_serial(self, message: str, machine: str) -> None: + for logger in self.logger_list: + logger.log_serial(message, machine) + + +class TerminalLogger(AbstractLogger): + def __init__(self) -> None: + self._print_serial_logs = True + + def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: + if "machine" in attributes: + return f"{attributes['machine']}: {message}" + return message + + @staticmethod + def _eprint(*args: object, **kwargs: Any) -> None: + print(*args, file=sys.stderr, **kwargs) + + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: + self._eprint(self.maybe_prefix(message, attributes)) + + @contextmanager + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + with self.nested("subtest: " + name, attributes): + yield + + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + self._eprint( + self.maybe_prefix( + Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes + ) + ) + + tic = time.time() + yield + toc = time.time() + self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)") + + def info(self, *args, **kwargs) -> None: # type: ignore + self.log(*args, **kwargs) + + def warning(self, *args, **kwargs) -> None: # type: ignore + self.log(*args, **kwargs) + + def error(self, *args, **kwargs) -> None: # type: ignore + self.log(*args, **kwargs) + + def print_serial_logs(self, enable: bool) -> None: + self._print_serial_logs = enable + + def log_serial(self, message: str, machine: str) -> None: + if not self._print_serial_logs: + return + + self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL) + + +class XMLLogger(AbstractLogger): def __init__(self) -> None: self.logfile = os.environ.get("LOGFILE", "/dev/null") self.logfile_handle = codecs.open(self.logfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") self.queue: "Queue[Dict[str, str]]" = Queue() - self.xml.startDocument() - self.xml.startElement("logfile", attrs=AttributesImpl({})) - self._print_serial_logs = True - def print_serial_logs(self, enable: bool) -> None: - self._print_serial_logs = enable - - @staticmethod - def _eprint(*args: object, **kwargs: Any) -> None: - print(*args, file=sys.stderr, **kwargs) + self.xml.startDocument() + self.xml.startElement("logfile", attrs=AttributesImpl({})) def close(self) -> None: self.xml.endElement("logfile") @@ -94,17 +187,19 @@ class Logger(AbstractLogger): def error(self, *args, **kwargs) -> None: # type: ignore self.log(*args, **kwargs) - sys.exit(1) def log(self, message: str, attributes: Dict[str, str] = {}) -> None: - self._eprint(self.maybe_prefix(message, attributes)) self.drain_log_queue() self.log_line(message, attributes) + def print_serial_logs(self, enable: bool) -> None: + self._print_serial_logs = enable + def log_serial(self, message: str, machine: str) -> None: + if not self._print_serial_logs: + return + self.enqueue({"msg": message, "machine": machine, "type": "serial"}) - if self._print_serial_logs: - self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL) def enqueue(self, item: Dict[str, str]) -> None: self.queue.put(item) @@ -126,12 +221,6 @@ class Logger(AbstractLogger): @contextmanager def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: - self._eprint( - self.maybe_prefix( - Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes - ) - ) - self.xml.startElement("nest", attrs=AttributesImpl({})) self.xml.startElement("head", attrs=AttributesImpl(attributes)) self.xml.characters(message) @@ -147,4 +236,6 @@ class Logger(AbstractLogger): self.xml.endElement("nest") -rootlog: AbstractLogger = Logger() +terminal_logger = TerminalLogger() +xml_logger = XMLLogger() +rootlog: AbstractLogger = CompositeLogger([terminal_logger, xml_logger]) diff --git a/nixos/lib/test-script-prepend.py b/nixos/lib/test-script-prepend.py index 976992ea0015..9d2efdf97303 100644 --- a/nixos/lib/test-script-prepend.py +++ b/nixos/lib/test-script-prepend.py @@ -4,7 +4,7 @@ from test_driver.driver import Driver from test_driver.vlan import VLan from test_driver.machine import Machine -from test_driver.logger import Logger +from test_driver.logger import AbstractLogger from typing import Callable, Iterator, ContextManager, Optional, List, Dict, Any, Union from typing_extensions import Protocol from pathlib import Path @@ -44,7 +44,7 @@ test_script: Callable[[], None] machines: List[Machine] vlans: List[VLan] driver: Driver -log: Logger +log: AbstractLogger create_machine: CreateMachineProtocol run_tests: Callable[[], None] join_all: Callable[[], None] From 9e8d6bbe2488d1305b276e3e0686c6ebee7eaba8 Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Tue, 9 Apr 2024 09:43:20 +0200 Subject: [PATCH 12/90] nixos/test-driver: add junit-xml logger We add a new logger that allows generating a junit-xml compatible report listing the subtests used in the nixos integration test. Junit-xml is a widely used standard for test reports. The report can be used for quick evaluation of which subtest failed. --- nixos/lib/test-driver/test_driver/__init__.py | 17 ++++- nixos/lib/test-driver/test_driver/logger.py | 76 ++++++++++++++++++- 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index 9daae1e941a6..91da765e0d2b 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -6,7 +6,7 @@ from pathlib import Path import ptpython.repl from test_driver.driver import Driver -from test_driver.logger import rootlog +from test_driver.logger import JunitXMLLogger, XMLLogger, rootlog class EnvDefault(argparse.Action): @@ -92,6 +92,11 @@ def main() -> None: default=Path.cwd(), type=writeable_dir, ) + arg_parser.add_argument( + "--junit-xml", + help="Enable JunitXML report generation to the given path", + type=Path, + ) arg_parser.add_argument( "testscript", action=EnvDefault, @@ -102,6 +107,14 @@ def main() -> None: args = arg_parser.parse_args() + output_directory = args.output_directory.resolve() + + if "LOGFILE" in os.environ.keys(): + rootlog.add_logger(XMLLogger(os.environ["LOGFILE"])) + + if args.junit_xml: + rootlog.add_logger(JunitXMLLogger(output_directory / args.junit_xml)) + if not args.keep_vm_state: rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state") @@ -109,7 +122,7 @@ def main() -> None: args.start_scripts, args.vlans, args.testscript.read_text(), - args.output_directory.resolve(), + output_directory, args.keep_vm_state, args.global_timeout, ) as driver: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index f50e3b78a828..ec1e25bf2db4 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -1,3 +1,4 @@ +import atexit import codecs import os import sys @@ -5,12 +6,14 @@ import time import unicodedata from abc import ABC, abstractmethod from contextlib import ExitStack, contextmanager +from pathlib import Path from queue import Empty, Queue from typing import Any, Dict, Iterator, List from xml.sax.saxutils import XMLGenerator from xml.sax.xmlreader import AttributesImpl from colorama import Fore, Style +from junit_xml import TestCase, TestSuite class AbstractLogger(ABC): @@ -49,6 +52,77 @@ class AbstractLogger(ABC): pass +class JunitXMLLogger(AbstractLogger): + + class TestCaseState: + def __init__(self) -> None: + self.stdout = "" + self.stderr = "" + self.failure = False + + def __init__(self, outfile: Path) -> None: + self.tests: dict[str, JunitXMLLogger.TestCaseState] = { + "main": self.TestCaseState() + } + self.currentSubtest = "main" + self.outfile: Path = outfile + self._print_serial_logs = True + atexit.register(self.close) + + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: + self.tests[self.currentSubtest].stdout += message + os.linesep + + @contextmanager + def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + old_test = self.currentSubtest + self.tests.setdefault(name, self.TestCaseState()) + self.currentSubtest = name + + yield + + self.currentSubtest = old_test + + @contextmanager + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: + self.log(message) + yield + + def info(self, *args, **kwargs) -> None: # type: ignore + self.tests[self.currentSubtest].stdout += args[0] + os.linesep + + def warning(self, *args, **kwargs) -> None: # type: ignore + self.tests[self.currentSubtest].stdout += args[0] + os.linesep + + def error(self, *args, **kwargs) -> None: # type: ignore + self.tests[self.currentSubtest].stderr += args[0] + os.linesep + self.tests[self.currentSubtest].failure = True + + def log_serial(self, message: str, machine: str) -> None: + if not self._print_serial_logs: + return + + self.log(f"{machine} # {message}") + + def print_serial_logs(self, enable: bool) -> None: + self._print_serial_logs = enable + + def close(self) -> None: + with open(self.outfile, "w") as f: + test_cases = [] + for name, test_case_state in self.tests.items(): + tc = TestCase( + name, + stdout=test_case_state.stdout, + stderr=test_case_state.stderr, + ) + if test_case_state.failure: + tc.add_failure_info("test case failed") + + test_cases.append(tc) + ts = TestSuite("NixOS integration test", test_cases) + f.write(TestSuite.to_xml_string([ts])) + + class CompositeLogger(AbstractLogger): def __init__(self, logger_list: List[AbstractLogger]) -> None: self.logger_list = logger_list @@ -238,4 +312,4 @@ class XMLLogger(AbstractLogger): terminal_logger = TerminalLogger() xml_logger = XMLLogger() -rootlog: AbstractLogger = CompositeLogger([terminal_logger, xml_logger]) +rootlog: CompositeLogger = CompositeLogger([terminal_logger, xml_logger]) From 303618c7e12f002f3c6ce35013c09ae5ac8f69e9 Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Tue, 9 Apr 2024 11:20:29 +0200 Subject: [PATCH 13/90] nixos/test-driver: enable XML log selectively Previously, the XML logging was always present and only created an output file if a special environment variable was present. We now only create the XML logger if the environment variable is present, saving us from logging to XML internally if it is not required. --- nixos/lib/test-driver/test_driver/logger.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index ec1e25bf2db4..65cfa195dd1e 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -224,9 +224,8 @@ class TerminalLogger(AbstractLogger): class XMLLogger(AbstractLogger): - def __init__(self) -> None: - self.logfile = os.environ.get("LOGFILE", "/dev/null") - self.logfile_handle = codecs.open(self.logfile, "wb") + def __init__(self, outfile: str) -> None: + self.logfile_handle = codecs.open(outfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") self.queue: "Queue[Dict[str, str]]" = Queue() @@ -310,6 +309,4 @@ class XMLLogger(AbstractLogger): self.xml.endElement("nest") -terminal_logger = TerminalLogger() -xml_logger = XMLLogger() -rootlog: CompositeLogger = CompositeLogger([terminal_logger, xml_logger]) +rootlog: CompositeLogger = CompositeLogger([TerminalLogger()]) From d07866cddc4bbbd57c5b6853995459bd0f084a4a Mon Sep 17 00:00:00 2001 From: Stefan Hertrampf Date: Tue, 7 May 2024 15:12:38 +0200 Subject: [PATCH 14/90] nixos/test-driver: rm global logger We remove the global rootlog in favor of instantiating the logger as required in the __init__.py and pass it down as a parameter (of our AbstractLogger type). --- nixos/lib/test-driver/test_driver/__init__.py | 19 +++++--- nixos/lib/test-driver/test_driver/driver.py | 44 +++++++++++-------- nixos/lib/test-driver/test_driver/logger.py | 3 -- nixos/lib/test-driver/test_driver/machine.py | 16 ++++--- .../test_driver/polling_condition.py | 11 +++-- nixos/lib/test-driver/test_driver/vlan.py | 15 ++++--- 6 files changed, 64 insertions(+), 44 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index 91da765e0d2b..42b6d29b7671 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -6,7 +6,12 @@ from pathlib import Path import ptpython.repl from test_driver.driver import Driver -from test_driver.logger import JunitXMLLogger, XMLLogger, rootlog +from test_driver.logger import ( + CompositeLogger, + JunitXMLLogger, + TerminalLogger, + XMLLogger, +) class EnvDefault(argparse.Action): @@ -108,21 +113,23 @@ def main() -> None: args = arg_parser.parse_args() output_directory = args.output_directory.resolve() + logger = CompositeLogger([TerminalLogger()]) if "LOGFILE" in os.environ.keys(): - rootlog.add_logger(XMLLogger(os.environ["LOGFILE"])) + logger.add_logger(XMLLogger(os.environ["LOGFILE"])) if args.junit_xml: - rootlog.add_logger(JunitXMLLogger(output_directory / args.junit_xml)) + logger.add_logger(JunitXMLLogger(output_directory / args.junit_xml)) if not args.keep_vm_state: - rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state") + logger.info("Machine state will be reset. To keep it, pass --keep-vm-state") with Driver( args.start_scripts, args.vlans, args.testscript.read_text(), output_directory, + logger, args.keep_vm_state, args.global_timeout, ) as driver: @@ -138,7 +145,7 @@ def main() -> None: tic = time.time() driver.run_tests() toc = time.time() - rootlog.info(f"test script finished in {(toc-tic):.2f}s") + logger.info(f"test script finished in {(toc-tic):.2f}s") def generate_driver_symbols() -> None: @@ -147,7 +154,7 @@ def generate_driver_symbols() -> None: in user's test scripts. That list is then used by pyflakes to lint those scripts. """ - d = Driver([], [], "", Path()) + d = Driver([], [], "", Path(), CompositeLogger([])) test_symbols = d.test_symbols() with open("driver-symbols", "w") as fp: fp.write(",".join(test_symbols.keys())) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 0650acb4d897..10092fc966c8 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -9,7 +9,7 @@ from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional from colorama import Fore, Style -from test_driver.logger import rootlog +from test_driver.logger import AbstractLogger from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition from test_driver.vlan import VLan @@ -49,6 +49,7 @@ class Driver: polling_conditions: List[PollingCondition] global_timeout: int race_timer: threading.Timer + logger: AbstractLogger def __init__( self, @@ -56,6 +57,7 @@ class Driver: vlans: List[int], tests: str, out_dir: Path, + logger: AbstractLogger, keep_vm_state: bool = False, global_timeout: int = 24 * 60 * 60 * 7, ): @@ -63,12 +65,13 @@ class Driver: self.out_dir = out_dir self.global_timeout = global_timeout self.race_timer = threading.Timer(global_timeout, self.terminate_test) + self.logger = logger tmp_dir = get_tmp_dir() - with rootlog.nested("start all VLans"): + with self.logger.nested("start all VLans"): vlans = list(set(vlans)) - self.vlans = [VLan(nr, tmp_dir) for nr in vlans] + self.vlans = [VLan(nr, tmp_dir, self.logger) for nr in vlans] def cmd(scripts: List[str]) -> Iterator[NixStartScript]: for s in scripts: @@ -84,6 +87,7 @@ class Driver: tmp_dir=tmp_dir, callbacks=[self.check_polling_conditions], out_dir=self.out_dir, + logger=self.logger, ) for cmd in cmd(start_scripts) ] @@ -92,19 +96,19 @@ class Driver: return self def __exit__(self, *_: Any) -> None: - with rootlog.nested("cleanup"): + with self.logger.nested("cleanup"): self.race_timer.cancel() for machine in self.machines: machine.release() def subtest(self, name: str) -> Iterator[None]: """Group logs under a given test name""" - with rootlog.subtest(name): + with self.logger.subtest(name): try: yield return True except Exception as e: - rootlog.error(f'Test "{name}" failed with error: "{e}"') + self.logger.error(f'Test "{name}" failed with error: "{e}"') raise e def test_symbols(self) -> Dict[str, Any]: @@ -118,7 +122,7 @@ class Driver: machines=self.machines, vlans=self.vlans, driver=self, - log=rootlog, + log=self.logger, os=os, create_machine=self.create_machine, subtest=subtest, @@ -150,13 +154,13 @@ class Driver: def test_script(self) -> None: """Run the test script""" - with rootlog.nested("run the VM test script"): + with self.logger.nested("run the VM test script"): symbols = self.test_symbols() # call eagerly exec(self.tests, symbols, None) def run_tests(self) -> None: """Run the test script (for non-interactive test runs)""" - rootlog.info( + self.logger.info( f"Test will time out and terminate in {self.global_timeout} seconds" ) self.race_timer.start() @@ -168,13 +172,13 @@ class Driver: def start_all(self) -> None: """Start all machines""" - with rootlog.nested("start all VMs"): + with self.logger.nested("start all VMs"): for machine in self.machines: machine.start() def join_all(self) -> None: """Wait for all machines to shut down""" - with rootlog.nested("wait for all VMs to finish"): + with self.logger.nested("wait for all VMs to finish"): for machine in self.machines: machine.wait_for_shutdown() self.race_timer.cancel() @@ -182,7 +186,7 @@ class Driver: def terminate_test(self) -> None: # This will be usually running in another thread than # the thread actually executing the test script. - with rootlog.nested("timeout reached; test terminating..."): + with self.logger.nested("timeout reached; test terminating..."): for machine in self.machines: machine.release() # As we cannot `sys.exit` from another thread @@ -227,7 +231,7 @@ class Driver: f"Unsupported arguments passed to create_machine: {args}" ) - rootlog.warning( + self.logger.warning( Fore.YELLOW + Style.BRIGHT + "WARNING: Using create_machine with a single dictionary argument is deprecated and will be removed in NixOS 24.11" @@ -246,13 +250,14 @@ class Driver: start_command=cmd, name=name, keep_vm_state=keep_vm_state, + logger=self.logger, ) def serial_stdout_on(self) -> None: - rootlog.print_serial_logs(True) + self.logger.print_serial_logs(True) def serial_stdout_off(self) -> None: - rootlog.print_serial_logs(False) + self.logger.print_serial_logs(False) def check_polling_conditions(self) -> None: for condition in self.polling_conditions: @@ -271,6 +276,7 @@ class Driver: def __init__(self, fun: Callable): self.condition = PollingCondition( fun, + driver.logger, seconds_interval, description, ) @@ -285,15 +291,17 @@ class Driver: def wait(self, timeout: int = 900) -> None: def condition(last: bool) -> bool: if last: - rootlog.info(f"Last chance for {self.condition.description}") + driver.logger.info( + f"Last chance for {self.condition.description}" + ) ret = self.condition.check(force=True) if not ret and not last: - rootlog.info( + driver.logger.info( f"({self.condition.description} failure not fatal yet)" ) return ret - with rootlog.nested(f"waiting for {self.condition.description}"): + with driver.logger.nested(f"waiting for {self.condition.description}"): retry(condition, timeout=timeout) if fun_ is None: diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 65cfa195dd1e..6fb8a3cf4e5d 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -307,6 +307,3 @@ class XMLLogger(AbstractLogger): self.log(f"(finished: {message}, in {toc - tic:.2f} seconds)") self.xml.endElement("nest") - - -rootlog: CompositeLogger = CompositeLogger([TerminalLogger()]) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 652cc600fad5..3a1d5bc1be76 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -17,7 +17,7 @@ from pathlib import Path from queue import Queue from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple -from test_driver.logger import rootlog +from test_driver.logger import AbstractLogger from .qmp import QMPSession @@ -270,6 +270,7 @@ class Machine: out_dir: Path, tmp_dir: Path, start_command: StartCommand, + logger: AbstractLogger, name: str = "machine", keep_vm_state: bool = False, callbacks: Optional[List[Callable]] = None, @@ -280,6 +281,7 @@ class Machine: self.name = name self.start_command = start_command self.callbacks = callbacks if callbacks is not None else [] + self.logger = logger # set up directories self.shared_dir = self.tmp_dir / "shared-xchg" @@ -307,15 +309,15 @@ class Machine: return self.booted and self.connected def log(self, msg: str) -> None: - rootlog.log(msg, {"machine": self.name}) + self.logger.log(msg, {"machine": self.name}) def log_serial(self, msg: str) -> None: - rootlog.log_serial(msg, self.name) + self.logger.log_serial(msg, self.name) def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: my_attrs = {"machine": self.name} my_attrs.update(attrs) - return rootlog.nested(msg, my_attrs) + return self.logger.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: assert self.monitor is not None @@ -1113,8 +1115,8 @@ class Machine: def cleanup_statedir(self) -> None: shutil.rmtree(self.state_dir) - rootlog.log(f"deleting VM state directory {self.state_dir}") - rootlog.log("if you want to keep the VM state, pass --keep-vm-state") + self.logger.log(f"deleting VM state directory {self.state_dir}") + self.logger.log("if you want to keep the VM state, pass --keep-vm-state") def shutdown(self) -> None: """ @@ -1221,7 +1223,7 @@ class Machine: def release(self) -> None: if self.pid is None: return - rootlog.info(f"kill machine (pid {self.pid})") + self.logger.info(f"kill machine (pid {self.pid})") assert self.process assert self.shell assert self.monitor diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/test_driver/polling_condition.py index 12cbad69e34e..1cccaf2c71e7 100644 --- a/nixos/lib/test-driver/test_driver/polling_condition.py +++ b/nixos/lib/test-driver/test_driver/polling_condition.py @@ -2,7 +2,7 @@ import time from math import isfinite from typing import Callable, Optional -from .logger import rootlog +from test_driver.logger import AbstractLogger class PollingConditionError(Exception): @@ -13,6 +13,7 @@ class PollingCondition: condition: Callable[[], bool] seconds_interval: float description: Optional[str] + logger: AbstractLogger last_called: float entry_count: int @@ -20,11 +21,13 @@ class PollingCondition: def __init__( self, condition: Callable[[], Optional[bool]], + logger: AbstractLogger, seconds_interval: float = 2.0, description: Optional[str] = None, ): self.condition = condition # type: ignore self.seconds_interval = seconds_interval + self.logger = logger if description is None: if condition.__doc__: @@ -41,7 +44,7 @@ class PollingCondition: if (self.entered or not self.overdue) and not force: return True - with self, rootlog.nested(self.nested_message): + with self, self.logger.nested(self.nested_message): time_since_last = time.monotonic() - self.last_called last_message = ( f"Time since last: {time_since_last:.2f}s" @@ -49,13 +52,13 @@ class PollingCondition: else "(not called yet)" ) - rootlog.info(last_message) + self.logger.info(last_message) try: res = self.condition() # type: ignore except Exception: res = False res = res is None or res - rootlog.info(self.status_message(res)) + self.logger.info(self.status_message(res)) return res def maybe_raise(self) -> None: diff --git a/nixos/lib/test-driver/test_driver/vlan.py b/nixos/lib/test-driver/test_driver/vlan.py index ec9679108e58..9340fc92ed4c 100644 --- a/nixos/lib/test-driver/test_driver/vlan.py +++ b/nixos/lib/test-driver/test_driver/vlan.py @@ -4,7 +4,7 @@ import pty import subprocess from pathlib import Path -from test_driver.logger import rootlog +from test_driver.logger import AbstractLogger class VLan: @@ -19,17 +19,20 @@ class VLan: pid: int fd: io.TextIOBase + logger: AbstractLogger + def __repr__(self) -> str: return f"" - def __init__(self, nr: int, tmp_dir: Path): + def __init__(self, nr: int, tmp_dir: Path, logger: AbstractLogger): self.nr = nr self.socket_dir = tmp_dir / f"vde{self.nr}.ctl" + self.logger = logger # TODO: don't side-effect environment here os.environ[f"QEMU_VDE_SOCKET_{self.nr}"] = str(self.socket_dir) - rootlog.info("start vlan") + self.logger.info("start vlan") pty_master, pty_slave = pty.openpty() # The --hub is required for the scenario determined by @@ -52,11 +55,11 @@ class VLan: assert self.process.stdout is not None self.process.stdout.readline() if not (self.socket_dir / "ctl").exists(): - rootlog.error("cannot start vde_switch") + self.logger.error("cannot start vde_switch") - rootlog.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") + self.logger.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") def __del__(self) -> None: - rootlog.info(f"kill vlan (pid {self.pid})") + self.logger.info(f"kill vlan (pid {self.pid})") self.fd.close() self.process.terminate() From 8291b47cb2f785db7a57dba2b3593aa61e94883e Mon Sep 17 00:00:00 2001 From: Elias Date: Thu, 9 May 2024 05:59:35 -0600 Subject: [PATCH 15/90] libwacom-surface: 2.7.0 -> 2.10.0 --- .../development/libraries/libwacom/surface.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix index 22707a375954..54f5c424fda3 100644 --- a/pkgs/development/libraries/libwacom/surface.nix +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -7,8 +7,8 @@ let libwacom-surface = fetchFromGitHub { owner = "linux-surface"; repo = "libwacom-surface"; - rev = "v2.7.0-1"; - hash = "sha256-LgJ8YFQQN05kyd6kxBakIIiGgZ9icW27xKK3Dz6TwLs="; + rev = "v2.10.0-1"; + hash = "sha256-5/9X20veXazXEdSDGY5aMGQixulqMlC5Av0NGOF9m98="; }; in libwacom.overrideAttrs (old: { pname = "libwacom-surface"; @@ -23,11 +23,15 @@ in libwacom.overrideAttrs (old: { "0005-data-Add-Microsoft-Surface-Pro-5.patch" "0006-data-Add-Microsoft-Surface-Pro-6.patch" "0007-data-Add-Microsoft-Surface-Pro-7.patch" - "0008-data-Add-Microsoft-Surface-Book.patch" - "0009-data-Add-Microsoft-Surface-Book-2-13.5.patch" - "0010-data-Add-Microsoft-Surface-Book-2-15.patch" - "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch" - "0012-data-Add-Microsoft-Surface-Book-3-15.patch" + "0008-data-Add-Microsoft-Surface-Pro-7.patch" + "0009-data-Add-Microsoft-Surface-Pro-8.patch" + "0010-data-Add-Microsoft-Surface-Pro-9.patch" + "0011-data-Add-Microsoft-Surface-Book.patch" + "0012-data-Add-Microsoft-Surface-Book-2-13.5.patch" + "0013-data-Add-Microsoft-Surface-Book-2-15.patch" + "0014-data-Add-Microsoft-Surface-Book-3-13.5.patch" + "0015-data-Add-Microsoft-Surface-Book-3-15.patch" + "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch" ]; meta = old.meta // { From 11d974e67a3099d2a5a0d6d1e7e7feda474a38fa Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 9 May 2024 13:21:40 -0400 Subject: [PATCH 16/90] curl-impersonate: fix darwin build and make cross-compilation work --- ...impersonate-0.6.1-fix-command-paths.patch} | 2 +- .../networking/curl-impersonate/default.nix | 40 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) rename pkgs/tools/networking/curl-impersonate/{curl-impersonate-0.5.2-fix-shebangs.patch => curl-impersonate-0.6.1-fix-command-paths.patch} (79%) diff --git a/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch b/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.6.1-fix-command-paths.patch similarity index 79% rename from pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch rename to pkgs/tools/networking/curl-impersonate/curl-impersonate-0.6.1-fix-command-paths.patch index 7082c25ac148..04ae8e93595f 100644 --- a/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.5.2-fix-shebangs.patch +++ b/pkgs/tools/networking/curl-impersonate/curl-impersonate-0.6.1-fix-command-paths.patch @@ -7,7 +7,7 @@ index 877c54f..3e39ed1 100644 $(nss_static_libs): $(NSS_VERSION).tar.gz tar xf $(NSS_VERSION).tar.gz + sed -i -e "1s@#!/usr/bin/env bash@#!$$(type -p bash)@" $(NSS_VERSION)/nss/build.sh -+ sed -i -e "s@/usr/bin/env grep@$$(type -p grep)@" $(NSS_VERSION)/nss/coreconf/config.gypi ++ sed -i -e "s@/usr/bin/\(env \)\?grep@$$(type -p grep)@" $(NSS_VERSION)/nss/coreconf/config.gypi ifeq ($(host),$(build)) # Native build, use NSS' build script. diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 53db8a622080..05e525db2824 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -6,16 +6,14 @@ , buildGoModule , installShellFiles , symlinkJoin +, buildPackages , zlib , sqlite , cmake , python3 , ninja , perl -# autoconf-2.71 fails on problematic configure: -# checking curl version... 7.84.0 -# ./configure: line 6713: syntax error near unexpected token `;;' -, autoconf269 +, autoconf , automake , libtool , darwin @@ -41,13 +39,14 @@ let }; patches = [ - # Fix shebangs in the NSS build script - # (can't just patchShebangs since makefile unpacks it) - ./curl-impersonate-0.5.2-fix-shebangs.patch + # Fix shebangs and commands in the NSS build scripts + # (can't just patchShebangs or substituteInPlace since makefile unpacks it) + ./curl-impersonate-0.6.1-fix-command-paths.patch # SOCKS5 heap buffer overflow - https://curl.se/docs/CVE-2023-38545.html (fetchpatch { - url = "https://github.com/lwthiker/curl-impersonate/commit/e7b90a0d9c61b6954aca27d346750240e8b6644e.patch"; + name = "curl-impersonate-patch-cve-2023-38545.patch"; + url = "https://github.com/lwthiker/curl-impersonate/commit/e7b90a0d9c61b6954aca27d346750240e8b6644e.diff"; hash = "sha256-jFrz4Q+MJGfNmwwzHhThado4c9hTd/+b/bfRsr3FW5k="; }) ]; @@ -58,6 +57,10 @@ let strictDeps = true; + depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + buildPackages.stdenv.cc + ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize' darwin.cctools @@ -65,10 +68,10 @@ let installShellFiles cmake python3 - python3.pkgs.gyp + python3.pythonOnBuildForHost.pkgs.gyp ninja perl - autoconf269 + autoconf automake libtool unzip @@ -115,26 +118,26 @@ let # Patch all shebangs of installed scripts patchShebangs $out/bin + # Install headers + make -C curl-*/include install + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # Build and install completions for each curl binary # Patch in correct binary name and alias it to all scripts perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell zsh >$TMPDIR/curl-impersonate-${name}.zsh substituteInPlace $TMPDIR/curl-impersonate-${name}.zsh \ - --replace \ + --replace-fail \ '#compdef curl' \ "#compdef curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' %f=curl-impersonate-${name}')" perl curl-*/scripts/completion.pl --curl $out/bin/curl-impersonate-${name} --shell fish >$TMPDIR/curl-impersonate-${name}.fish substituteInPlace $TMPDIR/curl-impersonate-${name}.fish \ - --replace \ + --replace-fail \ '--command curl' \ "--command curl-impersonate-${name}$(find $out/bin -name 'curl_*' -printf ' --command %f')" # Install zsh and fish completions installShellCompletion $TMPDIR/curl-impersonate-${name}.{zsh,fish} - - # Install headers - make -C curl-*/include install ''; preFixup = let @@ -142,9 +145,10 @@ let in '' # If libnssckbi.so is needed, link libnssckbi.so without needing nss in closure if grep -F nssckbi $out/lib/libcurl-impersonate-*${libext} &>/dev/null; then - # NOTE: "p11-kit-trust" always ends in ".so" even when on darwin - ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi${libext} - ${lib.optionalString stdenv.isLinux "patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext}"} + ln -s ${p11-kit}/lib/pkcs11/p11-kit-trust${libext} $out/lib/libnssckbi${libext} + ${lib.optionalString stdenv.hostPlatform.isElf '' + patchelf --add-needed libnssckbi${libext} $out/lib/libcurl-impersonate-*${libext} + ''} fi ''; From 1acb0ea6a93c5a98a6d079a3c8522ba361664414 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 9 May 2024 13:22:07 -0400 Subject: [PATCH 17/90] curl-impersonate: add meta.mainProgram --- pkgs/tools/networking/curl-impersonate/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index 05e525db2824..8f7b659d19b5 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -175,13 +175,14 @@ let license = with licenses; [ curl mit ]; maintainers = with maintainers; [ deliciouslytyped lilyinstarlight ]; platforms = platforms.unix; + mainProgram = "curl-impersonate-${name}"; }; }; in symlinkJoin rec { pname = "curl-impersonate"; - inherit (passthru.curl-impersonate-ff) version meta; + inherit (passthru.curl-impersonate-chrome) version meta; name = "${pname}-${version}"; @@ -196,7 +197,7 @@ symlinkJoin rec { updateScript = ./update.sh; - inherit (passthru.curl-impersonate-ff) src; + inherit (passthru.curl-impersonate-chrome) src; tests = { inherit (nixosTests) curl-impersonate; }; }; From ba9318ecf4e1eec280fb927e4699ea9e645d933f Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 11:02:12 +0900 Subject: [PATCH 18/90] syft: disable update check by default Nixos policy is not to ping home by default, so make the update check default to false. It can still be re-enabled by config or env var if required: - `check-for-app-update: true` in a `.syft.yaml` - SYFT_CHECK_FOR_APP_UPDATE=true This can be verified by checking for network connections when trying to scan a non-existing file (or `toolbox-data.anchore.io` dns requests): `strace -f -e connect syft scan a 2>&1 | grep AF_INET` --- pkgs/by-name/sy/syft/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 3c9da505b607..73a3c908d73e 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -42,6 +42,12 @@ buildGoModule rec { "-X=main.gitTreeState=clean" ]; + postPatch = '' + # Don't check for updates. + substituteInPlace cmd/syft/internal/options/update_check.go \ + --replace-fail "CheckForAppUpdate: true" "CheckForAppUpdate: false" + ''; + preBuild = '' ldflags+=" -X main.gitCommit=$(cat COMMIT)" ldflags+=" -X main.buildDate=$(cat SOURCE_DATE_EPOCH)" @@ -51,9 +57,6 @@ buildGoModule rec { doCheck = false; postInstall = '' - # avoid update checks when generating completions - export SYFT_CHECK_FOR_APP_UPDATE=false - installShellCompletion --cmd syft \ --bash <($out/bin/syft completion bash) \ --fish <($out/bin/syft completion fish) \ @@ -64,7 +67,6 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck - export SYFT_CHECK_FOR_APP_UPDATE=false $out/bin/syft --help $out/bin/syft version | grep "${version}" From e4975a606b82345fca631a63ec30303e1e72b4b7 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 13 May 2024 20:02:58 +0800 Subject: [PATCH 19/90] blueutil: 2.9.1 -> 2.10.0 - Format using nixfmt-rfc-style - Add passthru.tests.version - Add passthru.updateScript - Add meta.changelog --- pkgs/by-name/bl/blueutil/package.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix index 5acb43a5ebe6..9e3be68154b7 100644 --- a/pkgs/by-name/bl/blueutil/package.nix +++ b/pkgs/by-name/bl/blueutil/package.nix @@ -1,7 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + darwin, + testers, + nix-update-script, }: let @@ -9,13 +12,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "blueutil"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "toy"; repo = "blueutil"; rev = "v${finalAttrs.version}"; - hash = "sha256-dxsgMwgBImMxMMD+atgGakX3J9YMO2g3Yjl5zOJ8PW0="; + hash = "sha256-x2khx8Y0PolpMiyrBatT2aHHyacrQVU/02Z4Dz9fBtI="; }; buildInputs = [ @@ -34,7 +37,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + meta = { + changelog = "https://github.com/toy/blueutil/blob/main/CHANGELOG.md"; description = "CLI for bluetooth on OSX"; homepage = "https://github.com/toy/blueutil"; license = lib.licenses.mit; From ac4fb74bd28027187e6a965c62a0686689fe28ef Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Mon, 13 May 2024 16:08:10 +0200 Subject: [PATCH 20/90] vrc-get: 1.8.0 -> 1.8.1 --- pkgs/tools/misc/vrc-get/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index 140fba5c11f3..74db655f936d 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.8.0"; + version = "1.8.1"; src = fetchCrate { inherit pname version; - hash = "sha256-+xbHw1DpFmapjsFoUvxUqTok8TKMebMw3gYjO/rx/iU="; + hash = "sha256-j8B7g/w1Qtiuj099RlRLmrYTFiE7d2vVg/nTbaa8pRU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-iuLhDcii+wXDNUsUMo8lj4kfJve5RAz7FT5Pxs9yFPQ="; + cargoHash = "sha256-WFGY5osZIEYeHQchvuE3ddeqh2wzfZNV+SGqW08zYDI="; meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; From 6493d50082b3eb68263842036f88482a56a6fa35 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 13 May 2024 17:30:10 +0200 Subject: [PATCH 21/90] aaaaxy: 1.5.54 -> 1.5.129 https://github.com/divVerent/aaaaxy/releases/tag/v1.5.129 --- pkgs/by-name/aa/aaaaxy/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 386b8d62388a..3fca10f2577e 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.54"; + version = "1.5.129"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-FBla+KvUoUdCG0nM4falMJBq8NI75zqo/YSZy0bPFrE="; + hash = "sha256-kH2eFFxohvuuEP2p7bt8zOYbk3gF86X9y3sNdLYl/Qo="; fetchSubmodules = true; }; - vendorHash = "sha256-rE1YXDpiGnAUdmAaOHehyM38SPBqNvSRHhtXIUwRYVs="; + vendorHash = "sha256-VEayNWztJYeQoJHVJfAlmHD65PEho1TCttTfT0cbgUQ="; buildInputs = [ alsa-lib @@ -52,14 +52,14 @@ buildGoModule rec { postPatch = '' # Without patching, "go run" fails with the error message: # package github.com/google/go-licenses: no Go files in /build/source/vendor/github.com/google/go-licenses - substituteInPlace scripts/build-licenses.sh --replace \ + substituteInPlace scripts/build-licenses.sh --replace-fail \ '$GO run ''${GO_FLAGS} github.com/google/go-licenses' 'go-licenses' patchShebangs scripts/ substituteInPlace scripts/regression-test-demo.sh \ - --replace 'sh scripts/run-timedemo.sh' "$testing_infra/scripts/run-timedemo.sh" + --replace-fail 'sh scripts/run-timedemo.sh' "$testing_infra/scripts/run-timedemo.sh" - substituteInPlace Makefile --replace \ + substituteInPlace Makefile --replace-fail \ 'CPPFLAGS ?= -DNDEBUG' \ 'CPPFLAGS ?= -DNDEBUG -D_GLFW_GLX_LIBRARY=\"${lib.getLib libGL}/lib/libGL.so\" -D_GLFW_EGL_LIBRARY=\"${lib.getLib libGL}/lib/libEGL.so\"' ''; @@ -70,11 +70,11 @@ buildGoModule rec { # changes, the hash would change. # To work around this, use environment variables. postBuild = '' - substituteInPlace 'vendor/github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl/procaddr_others.go' \ - --replace \ + substituteInPlace 'vendor/github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl/procaddr_linbsd.go' \ + --replace-fail \ '{"libGL.so", "libGL.so.2", "libGL.so.1", "libGL.so.0"}' \ '{os.Getenv("EBITENGINE_LIBGL")}' \ - --replace \ + --replace-fail \ '{"libGLESv2.so", "libGLESv2.so.2", "libGLESv2.so.1", "libGLESv2.so.0"}' \ '{os.Getenv("EBITENGINE_LIBGLESv2")}' ''; From a79e24099e460868569e993b735c43961e19cf7e Mon Sep 17 00:00:00 2001 From: daru Date: Tue, 14 May 2024 05:56:05 +0200 Subject: [PATCH 22/90] hmcl: update to 3.5.7 from 3.5.5 --- pkgs/games/hmcl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 2dd9c7b7884e..f99dc58867bd 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -18,10 +18,10 @@ }: let - version = "3.5.5"; + version = "3.5.7"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; - hash = "sha256-MWp78rP4b39Scz5/gpsjwaJhSu+K9q3S2B2cD/V31MA="; + hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; }; in stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-bXZF38pd8I8cReuDNrZzDj1hp1Crk+P26JNiikUCg4g="; + hash = "sha256-ziqcauetWoFn58kBJ0KnqX5CPNC/Sn7DD/Buxdi977I="; }; dontUnpack = true; @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/hmcl} cp $src $out/lib/hmcl/hmcl.jar magick ${icon} hmcl.png - install -Dm644 hmcl.png $out/share/icons/hicolor/32x32/apps/hmcl.png + install -Dm644 hmcl-1.png $out/share/icons/hicolor/32x32/apps/hmcl.png makeBinaryWrapper ${jre}/bin/java $out/bin/hmcl \ --add-flags "-jar $out/lib/hmcl/hmcl.jar" \ --set LD_LIBRARY_PATH ${libpath} From 1cb1f3bcad45c844a54b1398b426bfc240868d56 Mon Sep 17 00:00:00 2001 From: daru Date: Tue, 14 May 2024 05:56:20 +0200 Subject: [PATCH 23/90] hmcl: add daru-san as a maintainer --- pkgs/games/hmcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index f99dc58867bd..9426b611f3a6 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "hmcl"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ daru-san ]; inherit (jre.meta) platforms; }; }) From 93f6f278c5a4be0ed37b1414e373d513e2768f3d Mon Sep 17 00:00:00 2001 From: booniepepper Date: Tue, 14 May 2024 09:19:43 -0700 Subject: [PATCH 24/90] sigi: 3.6.3 -> 3.6.4 --- .../misc/sigi/default.nix => by-name/si/sigi/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{applications/misc/sigi/default.nix => by-name/si/sigi/package.nix} (81%) diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/by-name/si/sigi/package.nix similarity index 81% rename from pkgs/applications/misc/sigi/default.nix rename to pkgs/by-name/si/sigi/package.nix index 16df94f4d0f9..2c23d52a40df 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/by-name/si/sigi/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.6.3"; + version = "3.6.4"; src = fetchCrate { inherit pname version; - hash = "sha256-JGQ9UbkS3Q1ohy6vtiUlPijuffH4Gb99cZCKreGqE/U="; + hash = "sha256-hw4dLQlIftbQfUK9+MT29jPPaeOPVLfkR6nqxJkn+t0="; }; - cargoHash = "sha256-W/ekk4tsYxG7FXzJW5i0Ii7nLgDHCSCjO3couN+/sMk="; + cargoHash = "sha256-WS+75LeXBuw6P1PZpygVrWbEHOuQCCzM9hsmkLwHsIg="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..4485edb5c719 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12925,8 +12925,6 @@ with pkgs; sigal = callPackage ../applications/misc/sigal { }; - sigi = callPackage ../applications/misc/sigi { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signalbackup-tools = darwin.apple_sdk_11_0.callPackage From 0ad69fc6116d613185b8017933c524f778b23499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 14 May 2024 19:34:00 +0200 Subject: [PATCH 25/90] astrolog: 7.30 -> 7.70 --- pkgs/applications/science/astronomy/astrolog/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/applications/science/astronomy/astrolog/default.nix index 7ad05e35e24e..a2e2e0f02cf6 100644 --- a/pkgs/applications/science/astronomy/astrolog/default.nix +++ b/pkgs/applications/science/astronomy/astrolog/default.nix @@ -3,13 +3,13 @@ , withEphemeris ? true , withMoonsEphemeris ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "astrolog"; - version = "7.30"; + version = "7.70"; src = fetchzip { - url = "http://www.astrolog.org/ftp/ast73src.zip"; - sha256 = "0nry4gxwy5aa99zzr8dlb6babpachsc3jjyk0vw82c7x3clbhl7l"; + url = "https://www.astrolog.org/ftp/ast77src.zip"; + hash = "sha256-rG7njEtnHwUDqWstj0bQxm2c9CbsOmWOCYs0FtiVoJE="; stripRoot = false; }; From 3a9f2d8f26896aadcfe776e0832845cba4240e13 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 14 May 2024 11:13:46 -0700 Subject: [PATCH 26/90] signalbackup-tools: 20240509-1 -> 20240514 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240509-1...20240514 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index d2c6e57ed8fb..f48cea71cb6a 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240509-1"; + version = "20240514"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-GUh/OTeJNBg3TDij/8jIEXfw9ox1wvq6tRq61JbMiZg="; + hash = "sha256-3coP4Bia/a2xbeHQBUq2rXPEPzWEX9hJX1kb1wh60FA="; }; postPatch = '' From 9cc138cec4235518ee2071c612988210afc04524 Mon Sep 17 00:00:00 2001 From: nhnn Date: Thu, 16 May 2024 18:12:34 +0300 Subject: [PATCH 27/90] maintainers: add nhnn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8db6af4fc87b..082a36169386 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14417,6 +14417,12 @@ githubId = 399535; name = "Niklas Hambüchen"; }; + nhnn = { + matrix = "@nhnn:nhnn.dev"; + github = "thenhnn"; + githubId = 162156666; + name = "nhnn"; + }; nhooyr = { email = "anmol@aubble.com"; github = "nhooyr"; From f4dc8f8e7994f45bbedca8034d64fff197528e54 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 17 May 2024 00:17:54 +0200 Subject: [PATCH 28/90] sword: 1.8.1 -> 1.9.0 --- .../sw/sword/package.nix} | 52 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 36 insertions(+), 18 deletions(-) rename pkgs/{development/libraries/sword/default.nix => by-name/sw/sword/package.nix} (54%) diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/by-name/sw/sword/package.nix similarity index 54% rename from pkgs/development/libraries/sword/default.nix rename to pkgs/by-name/sw/sword/package.nix index 8871a66fd8c9..c8382ccbaa7c 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/by-name/sw/sword/package.nix @@ -1,32 +1,53 @@ -{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }: - -stdenv.mkDerivation rec { +{ + lib, + stdenv, + fetchurl, + pkg-config, + icu, + clucene_core, + curl, +}: +stdenv.mkDerivation (finalAttrs: { pname = "sword"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { - url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz"; - sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v${lib.versions.majorMinor finalAttrs.version}/sword-${finalAttrs.version}.tar.gz"; + hash = "sha256-QkCc894vrxEIUj4sWsB0XSH57SpceO2HjuncwwNCa4o="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ icu clucene_core curl ]; + buildInputs = [ + icu + clucene_core + curl + ]; + + outputs = [ + "out" + "dev" + ]; prePatch = '' patchShebangs .; ''; - configureFlags = [ "--without-conf" "--enable-tests=no" ]; + configureFlags = [ + "--without-conf" + "--enable-tests=no" + ]; + CXXFLAGS = [ "-Wno-unused-but-set-variable" + "-Wno-unknown-warning-option" # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 "-DU_USING_ICU_NAMESPACE=1" ]; - meta = with lib; { - description = "A software framework that allows research manipulation of Biblical texts"; - homepage = "http://www.crosswire.org/sword/"; + meta = { + description = "Software framework that allows research manipulation of Biblical texts"; + homepage = "https://www.crosswire.org/sword/"; longDescription = '' The SWORD Project is the CrossWire Bible Society's free Bible software project. Its purpose is to create cross-platform open-source tools -- @@ -36,9 +57,8 @@ stdenv.mkDerivation rec { translators of the Bible, and have a growing collection of many hundred texts in around 100 languages. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; - -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 160b65391fea..586b593d92dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24565,8 +24565,6 @@ with pkgs; swiftclient = with python3Packages; toPythonApplication python-swiftclient; - sword = callPackage ../development/libraries/sword { }; - biblesync = callPackage ../development/libraries/biblesync { }; szip = callPackage ../development/libraries/szip { }; From 0f362cf7c530071179edfa959d3ea679439c5188 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 17 May 2024 10:05:26 +0200 Subject: [PATCH 29/90] gtkterm: 1.3.0 -> 1.3.1 Diff: https://github.com/Jeija/gtkterm/compare/1.3.0...1.3.1 --- pkgs/tools/misc/gtkterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix index d761cf0644a6..a1396ce7ac1c 100644 --- a/pkgs/tools/misc/gtkterm/default.nix +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gtkterm"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Jeija"; repo = "gtkterm"; rev = version; - sha256 = "sha256-KYkAHpyDl47LBKb7ZjxPCGw9XuMrqHPyejMhIvYAr68="; + sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI="; }; nativeBuildInputs = [ From 3c1e446a17800bd5bd2db456d3cb85724432d602 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 17 May 2024 10:07:56 +0200 Subject: [PATCH 30/90] gtkterm: Update repo owner and homepage The old repo redirects to the new one. The new maintainer has already made two releases. --- pkgs/tools/misc/gtkterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix index a1396ce7ac1c..7dac20b72c47 100644 --- a/pkgs/tools/misc/gtkterm/default.nix +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.1"; src = fetchFromGitHub { - owner = "Jeija"; + owner = "wvdakker"; repo = "gtkterm"; rev = version; sha256 = "sha256-oGqOXIu5P3KfdV6Unm7Nz+BRhb5Z6rne0+e0wZ2EcAI="; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple, graphical serial port terminal emulator"; - homepage = "https://github.com/Jeija/gtkterm"; + homepage = "https://github.com/wvdakker/gtkterm"; license = licenses.gpl3Plus; longDescription = '' GTKTerm is a simple, graphical serial port terminal emulator for From d6c00ca6967f055fe1d5d019e2fdee765c0d4d6e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 17 May 2024 20:18:22 +0200 Subject: [PATCH 31/90] mullvad-vpn: 2024.1 -> 2024.3 https://github.com/mullvad/mullvadvpn-app/releases/tag/2024.2 https://github.com/mullvad/mullvadvpn-app/releases/tag/2024.3 --- pkgs/applications/networking/mullvad-vpn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 6c3f30266e14..efb1abf260c0 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2024.1"; + version = "2024.3"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-io6ROUHoSBij1ah6yi1Gbni6yWVVoYZKUd7BR+GXKLg="; - aarch64-linux = "sha256-bzKTASfqjmjyKZecr8MGaChd6g48aQhfpuc+gUqwoPI="; + x86_64-linux = "sha256-LfuLBYGHlVEcVpHSdRSAEf9D7QChRd/fhx8EoCBZbSc="; + aarch64-linux = "sha256-7uUgewZ9KVLyMUax6u0R6ZN1YS3L4c43meVqJQD77lA="; }; in From 446bb88bb07644bc588dece492b46d5aeb67e573 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:16:35 -0300 Subject: [PATCH 32/90] blockattack: migrate to by-name --- .../default.nix => by-name/bl/blockattack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/blockattack/default.nix => by-name/bl/blockattack/package.nix} (100%) diff --git a/pkgs/games/blockattack/default.nix b/pkgs/by-name/bl/blockattack/package.nix similarity index 100% rename from pkgs/games/blockattack/default.nix rename to pkgs/by-name/bl/blockattack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6c9407956f..8a3ea78b071e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36254,8 +36254,6 @@ with pkgs; ballerburg = callPackage ../games/ballerburg { } ; - blockattack = callPackage ../games/blockattack { } ; - colobot = callPackage ../games/colobot { }; corsix-th = callPackage ../games/corsix-th { }; From 9d511f87c8ce76adcdb8299a236b7815c8054044 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:17:45 -0300 Subject: [PATCH 33/90] blockattack: refactor - finalAttrs - strictDeps - split outputs - no nested with in meta - updateScript --- pkgs/by-name/bl/blockattack/package.nix | 34 +++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index d59b93ae600c..c76d149eed18 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -1,30 +1,32 @@ { lib -, stdenv -, fetchFromGitHub , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf , boost , cmake +, fetchFromGitHub , gettext +, gitUpdater , physfs , pkg-config +, stdenv , zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; version = "2.8.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ + SDL2 cmake pkg-config gettext @@ -41,19 +43,31 @@ stdenv.mkDerivation rec { physfs ]; + outputs = [ + "out" + "man" + ]; + + strictDeps = true; + preConfigure = '' patchShebangs packdata.sh source/misc/translation/*.sh chmod +x ./packdata.sh ./packdata.sh ''; - meta = with lib; { + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { homepage = "https://blockattack.net/"; description = "An open source clone of Panel de Pon (aka Tetris Attack)"; - mainProgram = "blockattack"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; broken = stdenv.isDarwin; + changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "blockattack"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (SDL2.meta) platforms; }; -} +}) From 8ec62b508f9779654a7501435920de328c57f876 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:30:17 -0300 Subject: [PATCH 34/90] blockattack: use ninja Because it is faster (your mileage can vary). --- pkgs/by-name/bl/blockattack/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index c76d149eed18..ce94ef1d72ed 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -8,6 +8,7 @@ , fetchFromGitHub , gettext , gitUpdater +, ninja , physfs , pkg-config , stdenv @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ SDL2 cmake + ninja pkg-config gettext zip From abaecccc88dae6bcd6b5fcc47702f1929a263b58 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:31:12 -0300 Subject: [PATCH 35/90] blockattack: nixfmt --- pkgs/by-name/bl/blockattack/package.nix | 31 +++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index ce94ef1d72ed..415ba325d55d 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -1,18 +1,19 @@ -{ lib -, SDL2 -, SDL2_image -, SDL2_mixer -, SDL2_ttf -, boost -, cmake -, fetchFromGitHub -, gettext -, gitUpdater -, ninja -, physfs -, pkg-config -, stdenv -, zip +{ + lib, + SDL2, + SDL2_image, + SDL2_mixer, + SDL2_ttf, + boost, + cmake, + fetchFromGitHub, + gettext, + gitUpdater, + ninja, + physfs, + pkg-config, + stdenv, + zip, }: stdenv.mkDerivation (finalAttrs: { From 195936e03a08384eec83391f73c28af6b3a17805 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 17 May 2024 15:19:44 -0300 Subject: [PATCH 36/90] blockattack: 2.8.0 -> 2.9.0 Co-authored-by: R. RyanTM --- pkgs/by-name/bl/blockattack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 415ba325d55d..f0de4f2de8af 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; rev = "v${finalAttrs.version}"; - hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; + hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po="; }; nativeBuildInputs = [ From 1e2db6c5d8ea44b3ff8925418d24aaa404c8107e Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sun, 12 May 2024 22:52:33 +0200 Subject: [PATCH 37/90] icomoon-feather: init at 0-unstable-2024-05-12 --- pkgs/by-name/ic/icomoon-feather/package.nix | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ic/icomoon-feather/package.nix diff --git a/pkgs/by-name/ic/icomoon-feather/package.nix b/pkgs/by-name/ic/icomoon-feather/package.nix new file mode 100644 index 000000000000..916b40eb3b0d --- /dev/null +++ b/pkgs/by-name/ic/icomoon-feather/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "icomoon-feather"; + version = "0-unstable-2024-05-11"; + + src = fetchFromGitHub { + owner = "adi1090x"; + repo = "polybar-themes"; + rev = "adb6a4546a8351a469fa779df173e46b69aa1ac3"; + sparseCheckout = [ "fonts/panels/icomoon_feather.ttf" ]; + sha256 = "sha256-QL7/pfIqOd2JOm6rkH+P4rMg0AhGllfkReQ03YeGW+8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/panels/icomoon_feather.ttf -t $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/adi1090x/polybar-themes/tree/master/fonts/panels"; + description = "Icomoon feather font"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ luftmensch-luftmensch ]; + platforms = platforms.all; + }; +} From da7ae1baf8102e2f266bfce03230fe7b85604a6a Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Wed, 15 May 2024 15:47:54 +0200 Subject: [PATCH 38/90] gvisor: fix ldconfig path --- pkgs/by-name/gv/gvisor/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/gv/gvisor/package.nix b/pkgs/by-name/gv/gvisor/package.nix index 4389f6b1f92b..4caecce1ea3d 100644 --- a/pkgs/by-name/gv/gvisor/package.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -6,6 +6,7 @@ , iptables , makeWrapper , procps +, glibc }: buildGoModule { @@ -23,6 +24,12 @@ buildGoModule { hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A="; }; + # Replace the placeholder with the actual path to ldconfig + postPatch = '' + substituteInPlace runsc/container/container.go \ + --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"' + ''; + vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4="; nativeBuildInputs = [ makeWrapper ]; From 64cba0525ad617bb7c9301a438cf67ee0fdcea0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 13:04:30 +0000 Subject: [PATCH 39/90] initool: 0.14.1 -> 0.15.0 --- pkgs/development/tools/initool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/development/tools/initool/default.nix index a37d74afbd6a..e71860eb8d7a 100644 --- a/pkgs/development/tools/initool/default.nix +++ b/pkgs/development/tools/initool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "initool"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256-wb9hJ0R1R7kYt+TWznqfVGKms3hQjzB8TJYpS89da/E="; + hash = "sha256-QUCI3E04ggmFORUTYtwdwVJNnbuLwXI2OGwdg5/Ges4="; }; nativeBuildInputs = [ mlton ]; From 75d0c401baaf3670a2e1f0cd42a75f7f40d72e52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 17:15:46 +0000 Subject: [PATCH 40/90] librewolf-unwrapped: 125.0.3-1 -> 126.0-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 737f10a4f65b..45bd8a0efc3b 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "125.0.3-1", + "packageVersion": "126.0-1", "source": { - "rev": "125.0.3-1", - "sha256": "0ny4bh1kn9j8wqfbdi78fl2sh0sv14klznhsg47hvckgwf8iii6d" + "rev": "126.0-1", + "sha256": "1q8fjki6rgzrir84y7j2anra2w213bm0g74nw205gja9qsxlassc" }, "settings": { - "rev": "6b2b6a89fc15a705388955e4d1375f453d8cdc89", - "sha256": "0yginhc8pn00k1gh8h7bzvrl4vi2wimbmrrgnmvvblv28bxhwnh0" + "rev": "e439bde05b2980089b9c8a6f990562dcd9e9ca4a", + "sha256": "16fzdpjqz5ih2pjkj698hrqlw4wck4adys4cdfc2kflf6aydk39m" }, "firefox": { - "version": "125.0.3", - "sha512": "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484" + "version": "126.0", + "sha512": "56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527" } } From a35fac798e9965ed11ac2a41348f1af5ae839094 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 19 May 2024 17:45:03 +0100 Subject: [PATCH 41/90] apx: 2.4.0 -> 2.4.2 --- pkgs/tools/package-management/apx/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 26bece879f00..89f7b6032aee 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -1,22 +1,23 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, distrobox -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + distrobox, }: buildGoModule rec { pname = "apx"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; rev = "v${version}"; - hash = "sha256-OLJrwibw9uX5ty7FRZ0q8zx0i1vQXRKK8reQsJFFxAI="; + hash = "sha256-X6nphUzJc/R3Egw09eRQbza1QebpLGsMIfV7BpLOXTc="; }; - vendorHash = null; + vendorHash = "sha256-hGi+M5RRUL2oyxFGVeR0sum93/CA+FGYy0m4vDmlXTc="; nativeBuildInputs = [ installShellFiles ]; @@ -24,10 +25,10 @@ buildGoModule rec { postPatch = '' substituteInPlace config/apx.json \ - --replace "/usr/share/apx/distrobox/distrobox" "${distrobox}/bin/distrobox" \ - --replace "/usr/share/apx" "$out/bin/apx" + --replace-fail "/usr/share/apx/distrobox/distrobox" "${distrobox}/bin/distrobox" \ + --replace-fail "/usr/share/apx" "$out/bin/apx" substituteInPlace settings/config.go \ - --replace "/usr/share/apx/" "$out/share/apx/" + --replace-fail "/usr/share/apx/" "$out/share/apx/" ''; postInstall = '' From 3b7d9fa95d8170796cac2aa47dfaaff9fc75a587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 May 2024 01:34:55 +0200 Subject: [PATCH 42/90] golangci-lint: 1.58.1 -> 1.58.2 Diff: https://github.com/golangci/golangci-lint/compare/v1.58.1...v1.58.2 Changelog: https://github.com/golangci/golangci-lint/blob/v1.58.2/CHANGELOG.md --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 342a2c19e41d..6a618d491705 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.58.1"; + version = "1.58.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-RnrD1KA0XNdFx5bs2vfCoBEuBjtesyyTXAvIWMeRPVQ="; + hash = "sha256-LVkBIoRzmGQ6aJTOEyW51pdPqi7YOvuuAnaQwm0Fuyw="; }; - vendorHash = "sha256-Q3y4yam9gRFopZbAlLzWSFj59j+WwWeflJMdYmmJh7U="; + vendorHash = "sha256-BqNBglFoQQHhXIlI0UYerz0JLKmIzjjwqg2NYIeE14E="; subPackages = [ "cmd/golangci-lint" ]; From 42420dbc060d4c0cf0c2979bf8ba7400336ed9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 May 2024 01:35:31 +0200 Subject: [PATCH 43/90] golangci-lint: replace inactive maintainers with myself --- pkgs/development/tools/golangci-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 6a618d491705..c4210b1f3738 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -38,6 +38,6 @@ buildGoModule rec { changelog = "https://github.com/golangci/golangci-lint/blob/v${version}/CHANGELOG.md"; mainProgram = "golangci-lint"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ anpryl manveru mic92 ]; + maintainers = with maintainers; [ SuperSandro2000 mic92 ]; }; } From cdd1aaa86fa3205b86f0c6c746c8884ba783d4b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 May 2024 06:05:10 +0000 Subject: [PATCH 44/90] klipper: 0.12.0-unstable-2024-05-14 -> 0.12.0-unstable-2024-05-16 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 631deb3606df..cb8e81a6853c 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-05-14"; + version = "0.12.0-unstable-2024-05-16"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "e0cbd7b5fc1ce6d1dfbc8daf8e59f57bf3c5e5b9"; - sha256 = "sha256-fPeFul9BLWuw6T4IdRROCd9BY0e6sxr82Q3orDZnye8="; + rev = "b7f7b8a346388cc32d80b6e6f60e5fdb4cbd3ce6"; + sha256 = "sha256-TkhDLy7H1U2tjLJikkOgP+2apRJtZe9EIsNHzzljiB4="; }; sourceRoot = "${src.name}/klippy"; From 45087e1666ea066a241f975aac3e9bf104c40c32 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Mon, 20 May 2024 12:32:00 +0100 Subject: [PATCH 45/90] apx: install shell completions --- pkgs/tools/package-management/apx/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 89f7b6032aee..381307d6735e 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installShellFiles, distrobox, + podman, }: buildGoModule rec { @@ -19,7 +20,8 @@ buildGoModule rec { vendorHash = "sha256-hGi+M5RRUL2oyxFGVeR0sum93/CA+FGYy0m4vDmlXTc="; - nativeBuildInputs = [ installShellFiles ]; + # podman needed for apx to not error when building shell completions + nativeBuildInputs = [ installShellFiles podman ]; ldflags = [ "-s" "-w" ]; @@ -36,6 +38,15 @@ buildGoModule rec { installManPage man/man1/* install -Dm444 README.md -t $out/share/docs/apx install -Dm444 COPYING.md $out/share/licenses/apx/LICENSE + + # Create a temp writable home-dir so apx outputs completions without error + export HOME=$(mktemp -d) + # apx command now works (for completions) + # though complains "Error: no such file or directory" + installShellCompletion --cmd apx \ + --bash <($out/bin/apx completion bash) \ + --fish <($out/bin/apx completion fish) \ + --zsh <($out/bin/apx completion zsh) ''; meta = with lib; { From 401689964bc0be322aa098746e2abfeafab08c1d Mon Sep 17 00:00:00 2001 From: Lukas Eschbacher Date: Mon, 20 May 2024 15:30:21 +0200 Subject: [PATCH 46/90] prismlauncher: replace mesa-demos with glxinfo Signed-off-by: Lukas Eschbacher --- pkgs/games/prismlauncher/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 3393ff45efdc..f5b21d70844f 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -21,7 +21,7 @@ , jdk21 , gamemode , flite -, mesa-demos +, glxinfo , pciutils , udev , vulkan-loader @@ -113,7 +113,7 @@ symlinkJoin { runtimePrograms = [ xorg.xrandr - mesa-demos # need glxinfo + glxinfo pciutils # need lspci ] ++ additionalPrograms; From 2f31ae59e735111abd8c935d82256031e30c98af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:05:09 +0200 Subject: [PATCH 47/90] python312Packages.rns: 0.7.4 -> 0.7.5 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.7.4...0.7.5 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.7.5 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 6c3c582b2b0e..bc7f88d5dc59 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-M6iI554lv6PF5sIdOoaMIlQHP5YU8WM8YxfHMWhLSdE="; + hash = "sha256-TWaDRJQ695kjoKjWQeAO+uxSZGgQiHoWYIsS+XnYVOQ="; }; build-system = [ setuptools ]; From 6614648648b0a7c1a254ac7455e2751bb57e6274 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:05:48 +0200 Subject: [PATCH 48/90] python312Packages.nomadnet: 0.4.8 -> 0.4.9 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.4.8...0.4.9 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.4.9 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index d7548d3f8bd8..b51cf436da3e 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-a8fLfTJePf+pejDTqYNXCZda24LaNtOwxwEmEMAnB0I="; + hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; nativeBuildInputs = [ From 684d72bf1a5a9816acc918cd7408680bf82755ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:06:47 +0200 Subject: [PATCH 49/90] python312Packages.nomadnet: refactor --- pkgs/development/python-modules/nomadnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index b51cf436da3e..6c5c1dafd20c 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ rns lxmf urwid @@ -43,10 +43,10 @@ buildPythonPackage rec { meta = with lib; { description = "Off-grid, resilient mesh communication"; - mainProgram = "nomadnet"; homepage = "https://github.com/markqvist/NomadNet"; changelog = "https://github.com/markqvist/NomadNet/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "nomadnet"; }; } From 9211484ec35e956b8ecb8bfcfbf2534525db478c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:07:05 +0200 Subject: [PATCH 50/90] python312Packages.nomadnet: format with nixfmt --- .../python-modules/nomadnet/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 6c5c1dafd20c..6ffc0da4c30f 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxmf -, pythonOlder -, qrcode -, rns -, setuptools -, urwid +{ + lib, + buildPythonPackage, + fetchFromGitHub, + lxmf, + pythonOlder, + qrcode, + rns, + setuptools, + urwid, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ rns @@ -37,9 +36,7 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ - "nomadnet" - ]; + pythonImportsCheck = [ "nomadnet" ]; meta = with lib; { description = "Off-grid, resilient mesh communication"; From ac9dc2867f88e0440c7c7e42d6ec3f86ed23ec7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 16:07:56 +0200 Subject: [PATCH 51/90] python312Packages.lmxf: format with nixfmt --- .../python-modules/lxmf/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 6682b2b09f64..4e4147fc1bb0 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, rns -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + rns, + setuptools, }: buildPythonPackage rec { @@ -20,20 +21,14 @@ buildPythonPackage rec { hash = "sha256-8Usu2fecSnyVfGrEJED4qMBO5RwJjTq5c7svCTu445Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - rns - ]; + dependencies = [ rns ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "LXMF" - ]; + pythonImportsCheck = [ "LXMF" ]; meta = with lib; { description = "Lightweight Extensible Message Format for Reticulum"; From dde154d5a4c3e4b90097aabdc981c90a37d81da4 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Wed, 15 May 2024 22:14:28 -0500 Subject: [PATCH 52/90] kde-rounded-corners: switch to kdePackages --- .../kwin-decorations/kde-rounded-corners/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 99c5f7fe3fe0..5d2745e64974 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -3,8 +3,9 @@ , cmake , extra-cmake-modules , wrapQtAppsHook +, qtbase , kwin -, kdelibs4support +, kcmutils , libepoxy , libxcb , lib @@ -21,13 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-g7gNFv4/ighfxYz/VXF5KvcoT6t4lT5soDLlV3oAKvc="; }; - postConfigure = '' - substituteInPlace cmake_install.cmake \ - --replace "${kdelibs4support}" "$out" - ''; - nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ kwin kdelibs4support libepoxy libxcb ]; + buildInputs = [ kcmutils kwin libepoxy libxcb qtbase ]; meta = with lib; { description = "Rounds the corners of your windows"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05aca9f4018f..dc553d278b94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28666,7 +28666,7 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { }; - kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; khmeros = callPackage ../data/fonts/khmeros { }; From 29268b929462c515892a7cde9f5e6619a03682c9 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 20 May 2024 16:20:14 -0500 Subject: [PATCH 53/90] kde-rounded-corners: add devusb to maintainers --- .../themes/kwin-decorations/kde-rounded-corners/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 5d2745e64974..e7b5f13e6a7a 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Rounds the corners of your windows"; homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ devusb ]; }; } From 6d3992f17bbc97fffca66370c8c5312f7e369bd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 May 2024 22:07:08 +0000 Subject: [PATCH 54/90] miriway: 0-unstable-2024-04-30 -> 0-unstable-2024-05-17 --- pkgs/applications/window-managers/miriway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index b56127cc2948..a51f3838aa3a 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-04-30"; + version = "0-unstable-2024-05-17"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "726ef446c89a75510311638a4892e97ad9e0fa4e"; - hash = "sha256-7OoCoZ4IHXYI73W93P9MzVGYFv/+MDcbbhPdJY9lD2M="; + rev = "5be8f60326181b22e111f02918ae5778cf1a89b0"; + hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk="; }; strictDeps = true; From 6539b60f0b289add88d125ec45d748c4241c79b8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 18 Apr 2024 18:33:32 +0200 Subject: [PATCH 55/90] ayatana-indicator-power: init at 24.1.0 --- nixos/tests/ayatana-indicators.nix | 1 + .../ay/ayatana-indicator-power/package.nix | 107 ++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 pkgs/by-name/ay/ayatana-indicator-power/package.nix diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 5709ad2a1af6..13a0982a142b 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -29,6 +29,7 @@ in { packages = with pkgs; [ ayatana-indicator-datetime ayatana-indicator-messages + ayatana-indicator-power ayatana-indicator-session ] ++ (with pkgs.lomiri; [ lomiri-indicator-network diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix new file mode 100644 index 000000000000..74df2f6eb95f --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix @@ -0,0 +1,107 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, nixosTests +, cmake +, dbus +, dbus-test-runner +, glib +, gtest +, intltool +, libayatana-common +, libnotify +, librda +, lomiri +, pkg-config +, python3 +, systemd +, wrapGAppsHook3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-power"; + version = "24.1.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-power"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-VUDNy6pPOsjioV5UNiKm8dzYb02ZrZ8CiIiJmAoQYaM="; + }; + + postPatch = '' + # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' + + # Path needed for build-time codegen + substituteInPlace src/CMakeLists.txt \ + --replace-fail '/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' '${lomiri.lomiri-schemas}/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + intltool + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + libayatana-common + libnotify + librda + systemd + ] ++ (with lomiri; [ + cmake-extras + deviceinfo + lomiri-schemas + lomiri-sounds + ]); + + nativeCheckInputs = [ + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + dbus-test-runner + gtest + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_LOMIRI_FEATURES" true) + (lib.cmakeBool "ENABLE_DEVICEINFO" true) + (lib.cmakeBool "ENABLE_RDA" true) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + ayatana-indicators = [ "ayatana-indicator-power" ]; + tests.vm = nixosTests.ayatana-indicators; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Ayatana Indicator showing power state"; + longDescription = '' + This Ayatana Indicator displays current power management information and + gives the user a way to access power management preferences. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-power"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-power/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) From 98c84e67e47283304739f8a53bd3b18bc024dc84 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 18 Apr 2024 18:33:57 +0200 Subject: [PATCH 56/90] nixos/lomiri: Add power indicator --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + nixos/tests/lomiri.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index e11867b69107..0a1b86096e76 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -72,6 +72,7 @@ in { packages = (with pkgs; [ ayatana-indicator-datetime ayatana-indicator-messages + ayatana-indicator-power ayatana-indicator-session ]) ++ (with pkgs.lomiri; [ telephony-service diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index c5889d27133f..3f20aae44135 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -290,13 +290,14 @@ in { # There's a test app we could use that also displays their contents, but it's abit inconsistent. with subtest("ayatana indicators work"): mouse_click(735, 0) # the cog in the top-right, for the session indicator - machine.wait_for_text(r"(Notifications|Time|Date|System)") + machine.wait_for_text(r"(Notifications|Battery|Time|Date|System)") machine.screenshot("indicators_open") # Indicator order within the menus *should* be fixed based on per-indicator order setting # Session is the one we clicked, but the last we should test (logout). Go as far left as we can test. machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there with subtest("lomiri indicator network works"): @@ -304,6 +305,11 @@ in { machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") + with subtest("ayatana indicator power works"): + machine.send_key("right") + machine.wait_for_text(r"(Charge|Battery settings)") + machine.screenshot("indicators_power") + with subtest("ayatana indicator datetime works"): machine.send_key("right") machine.wait_for_text("Time and Date Settings") From 00585528916b9a469f0f8835e8006b6643b9630d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 May 2024 03:03:37 +0200 Subject: [PATCH 57/90] pkgs/applications: remove uneeded fetchpatch arguments --- pkgs/applications/accessibility/squeekboard/default.nix | 1 - pkgs/applications/audio/adlplug/default.nix | 1 - pkgs/applications/audio/clementine/default.nix | 1 - pkgs/applications/audio/fdkaac/default.nix | 2 +- pkgs/applications/audio/giada/default.nix | 1 - pkgs/applications/audio/lsp-plugins/default.nix | 2 +- pkgs/applications/audio/musikcube/default.nix | 1 - pkgs/applications/audio/tenacity/default.nix | 1 - pkgs/applications/blockchains/haven-cli/default.nix | 2 +- pkgs/applications/blockchains/solana-validator/default.nix | 1 - pkgs/applications/editors/rstudio/default.nix | 1 - pkgs/applications/editors/zee/default.nix | 2 +- pkgs/applications/emulators/darling/default.nix | 1 - pkgs/applications/emulators/vbam/default.nix | 1 - pkgs/applications/file-managers/nnn/default.nix | 1 - pkgs/applications/graphics/gnome-photos/default.nix | 1 - pkgs/applications/graphics/icon-library/default.nix | 1 - pkgs/applications/graphics/tesseract/tesseract4.nix | 2 +- pkgs/applications/graphics/tesseract/tesseract5.nix | 2 +- pkgs/applications/kde/falkon.nix | 2 +- pkgs/applications/misc/bambu-studio/default.nix | 1 - pkgs/applications/misc/bemenu/default.nix | 2 +- pkgs/applications/misc/feedbackd/default.nix | 1 - pkgs/applications/misc/lenmus/default.nix | 1 - pkgs/applications/misc/lutris/default.nix | 1 - pkgs/applications/misc/maliit-keyboard/default.nix | 1 - pkgs/applications/misc/mediaelch/default.nix | 1 - pkgs/applications/misc/qlcplus/default.nix | 2 +- pkgs/applications/misc/rlaunch/default.nix | 1 - pkgs/applications/misc/tandoor-recipes/default.nix | 1 - pkgs/applications/misc/wmenu/default.nix | 1 - pkgs/applications/networking/avalanchego/default.nix | 1 - pkgs/applications/networking/browsers/lynx/default.nix | 1 - pkgs/applications/networking/giara/default.nix | 1 - pkgs/applications/networking/gnome-network-displays/default.nix | 1 - pkgs/applications/networking/hydroxide/default.nix | 2 +- .../networking/instant-messengers/signald/default.nix | 2 +- pkgs/applications/networking/ipfs-cluster/default.nix | 2 +- pkgs/applications/networking/mailreaders/mmh/default.nix | 2 +- pkgs/applications/networking/mullvad/libwg.nix | 1 - pkgs/applications/networking/p2p/transgui/default.nix | 2 +- pkgs/applications/networking/sniffers/sngrep/default.nix | 1 - pkgs/applications/networking/sync/lsyncd/default.nix | 2 +- pkgs/applications/office/banking/default.nix | 1 - pkgs/applications/office/beancount/beancount_share.nix | 1 - pkgs/applications/office/gtg/default.nix | 1 - pkgs/applications/printing/pappl/default.nix | 1 - pkgs/applications/radio/gnss-sdr/default.nix | 1 - pkgs/applications/radio/gnuradio/default.nix | 1 - pkgs/applications/science/biology/samtools/default.nix | 2 +- pkgs/applications/science/electronics/dsview/default.nix | 2 +- pkgs/applications/science/electronics/nanovna-saver/default.nix | 1 - pkgs/applications/science/electronics/vhd2vl/default.nix | 1 - pkgs/applications/science/math/pari/default.nix | 1 - pkgs/applications/science/medicine/dcmtk/default.nix | 2 +- pkgs/applications/system/glances/default.nix | 2 +- pkgs/applications/terminal-emulators/foot/default.nix | 1 - pkgs/applications/version-management/fnc/default.nix | 2 +- pkgs/applications/version-management/gitlab/default.nix | 2 +- pkgs/applications/version-management/josh/default.nix | 1 - pkgs/applications/version-management/mercurial/default.nix | 2 +- pkgs/applications/video/minitube/default.nix | 2 +- pkgs/applications/video/mpv/default.nix | 1 - pkgs/applications/video/mpv/scripts/uosc.nix | 1 - pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/applications/video/rtabmap/default.nix | 1 - pkgs/applications/video/xine/ui.nix | 1 - pkgs/applications/virtualization/appvm/default.nix | 1 - pkgs/applications/virtualization/conmon/default.nix | 1 - pkgs/applications/window-managers/hyprwm/hypr/default.nix | 1 - 70 files changed, 24 insertions(+), 70 deletions(-) diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 119217ddfd8c..494988a39b2f 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -18,7 +18,6 @@ , rustc , feedbackd , wrapGAppsHook3 -, fetchpatch , nixosTests }: diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index a5d82b6e00dd..7cdbaa3b8722 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , fmt diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index e3558127a61d..e7cffe1bd949 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , boost , cmake , chromaprint diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 55e014e001fb..f944d414098f 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 7008e6a53155..5f0044f9fb0d 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , fltk diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index aec55c9437ad..89cd9b6ff329 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, makeWrapper , libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php, libXrandr }: diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index f25606886ff7..db91a2952bf2 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -2,7 +2,6 @@ , cmake , curl , fetchFromGitHub -, fetchpatch , ffmpeg , gnutls , lame diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index c2879d412324..f44a3f5da2e2 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitea -, fetchpatch , cmake , wxGTK32 , gtk3 diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 066bbde363ac..adec746d5a79 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config , boost179, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index caaae11fd88f..35dc9b31e16e 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -2,7 +2,6 @@ { stdenv , fetchFromGitHub -, fetchpatch , lib , rustPlatform , pkg-config diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index d3ca7de1d6a1..72c9ef5a2730 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchurl -, fetchpatch , fetchFromGitHub , makeDesktopItem , copyDesktopItems diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index e7db019467ba..b0ebcf635c5f 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, openssl, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "zee"; diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index 174b2f14c967..a5fe1021e917 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -3,7 +3,6 @@ , runCommandWith , writeShellScript , fetchFromGitHub -, fetchpatch , nixosTests , freetype diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index 3e7a7e2f47cd..3c89fed020b4 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -2,7 +2,6 @@ , cairo , cmake , fetchFromGitHub -, fetchpatch , ffmpeg , gettext , wxGTK32 diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 5972139b25b5..d8c10d783023 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , installShellFiles , makeWrapper , pkg-config diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 045a42d0e29d..d816adeb26ad 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , at-spi2-core , babl , dbus diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 3dae4b0e1b68..2f4aae6dc261 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , wrapGAppsHook4 , cargo , desktop-file-utils diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 88cda12a9c5e..bfee4bdb2774 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }: +, leptonica, libpng, libtiff, icu, pango, opencl-headers }: stdenv.mkDerivation rec { pname = "tesseract"; diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index b6d7e160818c..be81a3dd21c9 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers, fetchpatch +, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers , Accelerate, CoreGraphics, CoreVideo }: diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix index d949b5ce1b2d..b24375e75005 100644 --- a/pkgs/applications/kde/falkon.nix +++ b/pkgs/applications/kde/falkon.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch +{ stdenv, mkDerivation, lib , cmake, extra-cmake-modules, pkg-config , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 184ad1d8163e..57ad17ea4877 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -43,7 +43,6 @@ webkitgtk, wxGTK31, xorg, - fetchpatch, withSystemd ? stdenv.isLinux, }: let diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 5fac61399127..5cda5ec969bc 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon +{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon , pango, fribidi, harfbuzz, pcre, pkg-config, scdoc , ncursesSupport ? true, ncurses , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index f0d90a495c77..2c7320fdd9ef 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch2 , docbook-xsl-nons , docutils , gi-docgen diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 6736f342e89a..7dc018e08714 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , makeWrapper diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index b16acc4787b7..299ac3a9e2d4 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,7 +1,6 @@ { buildPythonApplication , lib , fetchFromGitHub -, fetchpatch # build inputs , atk diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index c67ac7a402fc..9613639b0f17 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , anthy , hunspell diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index b1d472a605a6..4ad51e4a7dac 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , qttools diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 159b7683e823..806ed8380f51 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev +{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, qtserialport, alsa-lib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index da90dbe5d74a..fe8d499d00a8 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , rustPlatform , xorg }: diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index dbf5500494c4..e4c7c51112a5 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -2,7 +2,6 @@ , nixosTests , python3 , fetchFromGitHub -, fetchpatch }: let python = python3.override { diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 72d437f74cc4..df568c045ac2 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromSourcehut -, fetchpatch , pkg-config , meson , ninja diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 63d45b86fa7a..6d75d3f56407 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -1,7 +1,6 @@ { IOKit , buildGoModule , fetchFromGitHub -, fetchpatch , lib , stdenv }: diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index a31dc94117ff..88943ae84638 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -8,7 +8,6 @@ , sslSupport ? true , openssl , nukeReferences -, fetchpatch }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 9acbf6f929b9..77a7777ceff0 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitLab -, fetchpatch , meson , gobject-introspection , pkg-config diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index 0de66fd3ee33..1e3945ea6380 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch # native , meson , ninja diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 132ad32160b9..e06c12049010 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hydroxide"; diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 2f83d994973b..425e4b45ec61 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal +gradle, git, perl, makeWrapper, substituteAll, jre_minimal }: # NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 4c623c869126..9a76be5704af 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 50bbb0b0f664..95c101002e2b 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, autoreconfHook, flex }: +{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }: let rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c"; in stdenv.mkDerivation rec { pname = "mmh"; diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index c14675013cbf..ab54d23486a2 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , mullvad -, fetchpatch }: buildGoModule { pname = "libwg"; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 70259e087bb8..e39bbee5cd88 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip +{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip , fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl , unstableGitUpdater }: diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index c042167623f7..45a1526751f8 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,7 +3,6 @@ , autoconf , automake , fetchFromGitHub -, fetchpatch , libpcap , ncurses , openssl diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index a5dc0bc8cf51..24908b4940e9 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync, +{ lib, stdenv, fetchFromGitHub, cmake, lua, pkg-config, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix index 1874521cb0cc..4aa70e81fab4 100644 --- a/pkgs/applications/office/banking/default.nix +++ b/pkgs/applications/office/banking/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitLab , python3 , appstream-glib diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 5386deff1d0b..3b2ae6c4ddf0 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 39c4353cb72c..6f3f7425eb0e 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , meson , python3Packages , ninja diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index b49cc1b43231..b47ba39f0ae5 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub -, fetchpatch , avahi , cups , gnutls diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 2a0d61a8e596..06838c40c2ce 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , armadillo , cmake , gmp diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index c03a3decb65c..de851c24fa28 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 70f436a088e1..7e12047e095b 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, htslib, perl, ncurses ? null }: +{ lib, stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }: stdenv.mkDerivation rec { pname = "samtools"; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 3c8e7ad19064..2818379afc38 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook , libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1 -, python3, fetchpatch, desktopToDarwinBundle +, python3, desktopToDarwinBundle }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index d1b38d8b8e07..dd58794ed182 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,7 +2,6 @@ lib, python3, fetchFromGitHub, - fetchpatch, qt6, }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index d56a8aa6ce84..078f5e951404 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , bison , flex , verilog diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 16c8def750d7..d876875268b7 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , gmp , libX11 , libpthreadstubs diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index 812606f9f03f..0fa41ba08760 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv -, libpng, cmake, fetchpatch }: +, libpng, cmake }: with lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 1aaf202c9f14..323d7c5e81fd 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib +{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib , defusedxml, future, ujson, packaging, psutil, setuptools # Optional dependencies: , bottle, pysnmp diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 44f38a99a528..2ab5829b3758 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitea , fetchurl -, fetchpatch , runCommand , fcft , freetype diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index e07b53854400..b52314180816 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c7a2823c6608..d37604612bdf 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch, fetchFromGitLab, bundlerEnv +{ stdenv, lib, fetchFromGitLab, bundlerEnv , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index b127966176cd..aed7ab9b52bf 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , rustPlatform , libgit2 , openssl diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 19ba699abef4..b6bf52048f5e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true # depends on rust-cpython which won't support python312 # https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9 diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 3caa2b7fc56c..557eba2b87b1 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by pasqui23 diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 163729d879b9..ec2acb9656bb 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -2,7 +2,6 @@ , config , stdenv , fetchFromGitHub -, fetchpatch , addOpenGLRunpath , bash , docutils diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index f57bb4eb8160..45b359a42a83 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, gitUpdater, makeFontsConf, buildLua, diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 07e8be2bea71..ce3ae604e7d1 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript +{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 6d5270d344ea..3b457530fbf2 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , cmake , opencv diff --git a/pkgs/applications/video/xine/ui.nix b/pkgs/applications/video/xine/ui.nix index 2437705ceac9..84631a8c4579 100644 --- a/pkgs/applications/video/xine/ui.nix +++ b/pkgs/applications/video/xine/ui.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , curl , libXext diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/applications/virtualization/appvm/default.nix index e96a8b7d46d7..c71236d127b6 100644 --- a/pkgs/applications/virtualization/appvm/default.nix +++ b/pkgs/applications/virtualization/appvm/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nix , virt-viewer -, fetchpatch , makeWrapper }: let diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index aa3675ac2001..a6931f2e709f 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , pkg-config , glib , glibc diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 18aa5e32261f..82ed70b0d6a0 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cairo , cmake , glib From 0bc0302b1889f53a5ee1979bcbf90209c09a6ba2 Mon Sep 17 00:00:00 2001 From: nhnn Date: Thu, 16 May 2024 18:14:20 +0300 Subject: [PATCH 58/90] simplesamlphp: init at 1.19.7 --- pkgs/by-name/si/simplesamlphp/package.nix | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/si/simplesamlphp/package.nix diff --git a/pkgs/by-name/si/simplesamlphp/package.nix b/pkgs/by-name/si/simplesamlphp/package.nix new file mode 100644 index 000000000000..4364e22fa205 --- /dev/null +++ b/pkgs/by-name/si/simplesamlphp/package.nix @@ -0,0 +1,25 @@ +{ + php, + fetchFromGitHub, + lib, +}: +php.buildComposerProject (finalAttrs: { + pname = "simplesamlphp"; + version = "1.19.7"; + + src = fetchFromGitHub { + owner = "simplesamlphp"; + repo = "simplesamlphp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Qmy9fuZq8MBqvYV6/u3Dg92pHHicuUhdNeB22u4hwwA="; + }; + + vendorHash = "sha256-FMFD0AXmD7Rq4d9+aNtGVk11YuOt40FWEqxvf+gBjmI="; + + meta = { + description = "SimpleSAMLphp is an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)."; + homepage = "https://simplesamlphp.org"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ nhnn ]; + }; +}) From 136720f1eae931e6d29bcd97931145d2e0b08bb1 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Tue, 21 May 2024 08:58:53 +0200 Subject: [PATCH 59/90] vscode-extensions.elixir-lsp.vscode-elixir-ls: 0.21.1 -> 0.21.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fad42392d45e..3f8a351eed85 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1477,8 +1477,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.21.1"; - hash = "sha256-z/GhynjkoEcaRp59tYr1lnM5vfV0OaDCcCpC02OdVLE="; + version = "0.21.2"; + hash = "sha256-UZthDY+O8rG+oz/jQyQKDPbdS+lVKiLyuicU+4SGivw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; From 3e14c44e21ee1c1d41888e7c39acb834be5e7b23 Mon Sep 17 00:00:00 2001 From: nhnn Date: Thu, 16 May 2024 18:18:58 +0300 Subject: [PATCH 60/90] nixos/simplesamlphp: init module --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/web-apps/simplesamlphp.nix | 128 ++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 nixos/modules/services/web-apps/simplesamlphp.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index d6b8ffe8609f..5665e7ba2592 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -217,6 +217,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [keto](https://www.ory.sh/keto/), a permission & access control server, the first open source implementation of ["Zanzibar: Google's Consistent, Global Authorization System"](https://research.google/pubs/zanzibar-googles-consistent-global-authorization-system/). +- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as [services.simplesamlphp](#opt-services.simplesamlphp). + ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b14b83a8119a..4e2b39f32a4e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1420,6 +1420,7 @@ ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix ./services/web-apps/silverbullet.nix + ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix diff --git a/nixos/modules/services/web-apps/simplesamlphp.nix b/nixos/modules/services/web-apps/simplesamlphp.nix new file mode 100644 index 000000000000..e970266fc17d --- /dev/null +++ b/nixos/modules/services/web-apps/simplesamlphp.nix @@ -0,0 +1,128 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.simplesamlphp; + + format = pkgs.formats.php { finalVariable = "config"; }; + + generateConfig = + opts: + pkgs.runCommand "simplesamlphp-config" { } '' + mkdir $out + cp ${format.generate "config.php" opts.settings} $out/config.php + cp ${format.generate "authsources.php" opts.authSources} $out/authsources.php + ''; +in +{ + meta = { + maintainers = with lib.maintainers; [ nhnn ]; + }; + + options.services.simplesamlphp = + with lib; + mkOption { + type = types.attrsOf ( + types.submodule ( + { config, ... }: + { + options = { + package = mkPackageOption pkgs "simplesamlphp" { }; + configureNginx = mkOption { + type = types.bool; + default = true; + description = "Configure nginx as a reverse proxy for SimpleSAMLphp."; + }; + phpfpmPool = mkOption { + type = types.str; + description = "The PHP-FPM pool that serves SimpleSAMLphp instance."; + }; + localDomain = mkOption { + type = types.str; + description = "The domain serving your SimpleSAMLphp instance. This option modifies only /saml route."; + }; + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + baseurlpath = mkOption { + type = types.str; + example = "https://filesender.example.com/saml/"; + description = "URL where SimpleSAMLphp can be reached."; + }; + }; + }; + default = { }; + description = '' + Configuration options used by SimpleSAMLphp. + See [](https://simplesamlphp.org/docs/stable/simplesamlphp-install) + for available options. + ''; + }; + + authSources = mkOption { + type = format.type; + default = { }; + description = '' + Auth sources options used by SimpleSAMLphp. + ''; + }; + + libDir = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the SimpleSAMLphp library directory. + ''; + }; + configDir = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the SimpleSAMLphp config directory. + ''; + }; + }; + config = { + libDir = "${config.package}/share/php/simplesamlphp/"; + configDir = "${generateConfig config}"; + }; + } + ) + ); + default = { }; + description = "Instances of SimpleSAMLphp. This module is designed to work with already existing PHP-FPM pool and NGINX virtualHost."; + }; + + config = { + services.phpfpm.pools = lib.mapAttrs' ( + phpfpmName: opts: + lib.nameValuePair opts.phpfpmPool { phpEnv.SIMPLESAMLPHP_CONFIG_DIR = "${generateConfig opts}"; } + ) cfg; + + services.nginx.virtualHosts = lib.mapAttrs' ( + phpfpmName: opts: + lib.nameValuePair opts.localDomain ( + lib.mkIf opts.configureNginx { + locations."^~ /saml/" = { + alias = "${opts.package}/share/php/simplesamlphp/www/"; + extraConfig = '' + location ~ ^(?/saml)(?.+?\.php)(?/.*)?$ { + include ${pkgs.nginx}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${phpfpmName}.socket}; + fastcgi_intercept_errors on; + fastcgi_param SCRIPT_FILENAME $document_root$phpfile; + fastcgi_param SCRIPT_NAME /saml$phpfile; + fastcgi_param PATH_INFO $pathinfo if_not_empty; + } + ''; + }; + } + ) + ) cfg; + }; +} From 0234bac73cf53bee97ccdddef71748be10a88479 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 13 May 2024 23:26:29 +0200 Subject: [PATCH 61/90] docker_26: 26.0.0 -> 26.1.3 https://docs.docker.com/engine/release-notes/26.0/ https://docs.docker.com/engine/release-notes/26.1/ --- pkgs/applications/virtualization/docker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e30ad02f5bc8..ab5ac47e7dff 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -308,15 +308,15 @@ rec { }; docker_26 = callPackage dockerGen rec { - version = "26.0.0"; + version = "26.1.3"; cliRev = "v${version}"; - cliHash = "sha256-jGg/AVnIzI8e+DdF0uKlSZApRxcwuOjCQpfnBaCY4fI="; + cliHash = "sha256-xE+g9Gtza4oAIlGUzDmjrqJa42bEkpbKbL2fsFlYzpY="; mobyRev = "v${version}"; - mobyHash = "sha256-cDlRVdQNzH/X2SJUYHK1QLUHlKQtSyRYCVbz3wPx1ZM="; + mobyHash = "sha256-s4hOvYV2+wDNKs4iFw6OflK+nemvqNhmfFURzhWaUzY="; runcRev = "v1.1.12"; runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.13"; - containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + containerdRev = "v1.7.15"; + containerdHash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; From c23df6a70c9b16d67c3dc0b0d5c42e050d404bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 10:01:59 +0000 Subject: [PATCH 62/90] python311Packages.rokuecp: 0.19.3 -> 0.19.4 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 47800983f5e3..f8cec672c27a 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.3"; + version = "0.19.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-XMJ2V59E4SEVlEhgc1hstLmtzl1gxwCsq+4vmkL3CPM="; + hash = "sha256-GotVSRSMdbAtDmVEXNizf5Pf/02sva1R/6ULL6h7ciY="; }; postPatch = '' From 317e40837c114dff6efd8f13ad182764da1d994c Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Sat, 18 May 2024 01:16:44 +0200 Subject: [PATCH 63/90] python312Packages.walrus: fix python 3.12 build --- pkgs/development/python-modules/walrus/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix index 73376590bda3..6c788c41a95a 100644 --- a/pkgs/development/python-modules/walrus/default.nix +++ b/pkgs/development/python-modules/walrus/default.nix @@ -5,6 +5,7 @@ , pythonOlder , redis , unittestCheckHook +, fetchpatch }: buildPythonPackage rec { @@ -21,6 +22,16 @@ buildPythonPackage rec { hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc="; }; + patches = [ + # distutils has been deprecated, this wraps its import inside a try-catch + # and fallsback to a fallback import. + # Should not be necessary in future versions. + (fetchpatch { + url = "https://github.com/coleifer/walrus/commit/79e20c89aa4015017ef8a3e0b5c27ca2731dc9b2.patch"; + hash = "sha256-hCpvki6SV3KYhicjjUMP4VrKMEerMjq2n1BgozXKDO8="; + }) + ]; + propagatedBuildInputs = [ redis ]; @@ -42,6 +53,8 @@ buildPythonPackage rec { "walrus" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Lightweight Python utilities for working with Redis"; homepage = "https://github.com/coleifer/walrus"; From 47da0aee5616a063015f10ea593688646f2377e4 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 21 May 2024 13:25:18 +0300 Subject: [PATCH 64/90] qt6: 6.7.0 -> 6.7.1 --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- pkgs/development/libraries/qt-6/srcs.nix | 314 +++++++++++------------ 2 files changed, 158 insertions(+), 158 deletions(-) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index a9c84b483238..7583d7d6ff55 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 767755fcbd87..25b5f5f48bc4 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt3d-everywhere-src-6.7.0.tar.xz"; - sha256 = "0934i5b90hyxk8s58ji7mc062wdsxlvb45y79ygvfcl6psl84fw0"; - name = "qt3d-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qt3d-everywhere-src-6.7.1.tar.xz"; + sha256 = "0yrmsn02ykd3k59mqvvjf4rwmhbx05i77blv6n41nsmxh6nc17pm"; + name = "qt3d-everywhere-src-6.7.1.tar.xz"; }; }; qt5compat = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz"; - sha256 = "1x8r9rjkyxhn2fzhj53z7biqd0hxkka5rdp0cc5s9n25hgyx8jcx"; - name = "qt5compat-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qt5compat-everywhere-src-6.7.1.tar.xz"; + sha256 = "02b011244vnq6v0fx78h084ff1nmxbzyrwryxrqc33qm37jbpi21"; + name = "qt5compat-everywhere-src-6.7.1.tar.xz"; }; }; qtactiveqt = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtactiveqt-everywhere-src-6.7.0.tar.xz"; - sha256 = "1cyh6h4829pjsklks1agym6gzz7pz2hbydvfqd190izv2fi8a125"; - name = "qtactiveqt-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtactiveqt-everywhere-src-6.7.1.tar.xz"; + sha256 = "0id5nmk8l0gyfsngq782pyg5ag5syr21dvmd4dy4kbs3w4hqf6fb"; + name = "qtactiveqt-everywhere-src-6.7.1.tar.xz"; }; }; qtbase = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz"; - sha256 = "0m5jp0rh5965d242s68wdvrxy3x1a6z3p89y8lxhxysj5sgf5chi"; - name = "qtbase-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.tar.xz"; + sha256 = "06ffdad2g0pcsyzicj8rgvixyx7ihfmgzvqlwxhxid6cpnhqscxp"; + name = "qtbase-everywhere-src-6.7.1.tar.xz"; }; }; qtcharts = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz"; - sha256 = "193w5grxndh0gfnyfipn7jdlskfz5b43h97zwbyh3yqvr6c597c9"; - name = "qtcharts-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtcharts-everywhere-src-6.7.1.tar.xz"; + sha256 = "132x7l43fm6m3jw3r8myqwr0kras161sg0ddkgaz04n8ndd8fdn2"; + name = "qtcharts-everywhere-src-6.7.1.tar.xz"; }; }; qtconnectivity = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz"; - sha256 = "0k14f7fqhychxj9j6xwad9yp7wjf7ps5f427l65krxwzq6mddbq7"; - name = "qtconnectivity-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtconnectivity-everywhere-src-6.7.1.tar.xz"; + sha256 = "1jrxlwh5avhri0ykzvqwy2y2r3qazs05vn5ask4l3ga2wkxhl0bh"; + name = "qtconnectivity-everywhere-src-6.7.1.tar.xz"; }; }; qtdatavis3d = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdatavis3d-everywhere-src-6.7.0.tar.xz"; - sha256 = "1a8v150bva3v9njhma7424jbczjb76l7pgzw61b0qyck326j94ss"; - name = "qtdatavis3d-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdatavis3d-everywhere-src-6.7.1.tar.xz"; + sha256 = "0z0scbmknq6bh9dqnicm3g24bf313bv3pa78lwdaggzg5z6i03ga"; + name = "qtdatavis3d-everywhere-src-6.7.1.tar.xz"; }; }; qtdeclarative = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz"; - sha256 = "0b4yz9c4lba9p5xgzaymz3a8fwl8s1p8cb0nh6jwrmvlk9bkj32s"; - name = "qtdeclarative-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdeclarative-everywhere-src-6.7.1.tar.xz"; + sha256 = "074zzmc1acha41dnz51gqs9x3niqyks5g356p22r6n9gxnb5q4w1"; + name = "qtdeclarative-everywhere-src-6.7.1.tar.xz"; }; }; qtdoc = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdoc-everywhere-src-6.7.0.tar.xz"; - sha256 = "0h4w06rc8xz31iy5g8cmxs9d0p9pd6nxlyjp2k6bbr2dq085w7lr"; - name = "qtdoc-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtdoc-everywhere-src-6.7.1.tar.xz"; + sha256 = "0kak2d0n8fbk70zbi7ln0bda46fcqln0p43qzzid6bmc8h42ws6d"; + name = "qtdoc-everywhere-src-6.7.1.tar.xz"; }; }; qtgraphs = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgraphs-everywhere-src-6.7.0.tar.xz"; - sha256 = "15clif3warl4hbgdjbpnpfgy4mi2y8hkj5sc4afhzbv2gsbd2dab"; - name = "qtgraphs-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtgraphs-everywhere-src-6.7.1.tar.xz"; + sha256 = "0f5wzzs6w2cq81rzx98lyc40jw37p8708dmdm7sgx8l93jclln3i"; + name = "qtgraphs-everywhere-src-6.7.1.tar.xz"; }; }; qtgrpc = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgrpc-everywhere-src-6.7.0.tar.xz"; - sha256 = "18gsi9sb4v4q2g0ccmf6nkj37vzixaaha3mk882p3qys250b26dp"; - name = "qtgrpc-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtgrpc-everywhere-src-6.7.1.tar.xz"; + sha256 = "186g1bndldf74hg3922vbw01mw44jy5l2y71zcgkw6r6y7w3994w"; + name = "qtgrpc-everywhere-src-6.7.1.tar.xz"; }; }; qthttpserver = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qthttpserver-everywhere-src-6.7.0.tar.xz"; - sha256 = "1ylvz3cny3g68lqdcy2bqii1820nyaspn28dybp7wlr15f5y7qn2"; - name = "qthttpserver-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qthttpserver-everywhere-src-6.7.1.tar.xz"; + sha256 = "1nxvyiyi9y7vgxdywrn2rlyfxq4snnvxlw2awzawh905l8g8687d"; + name = "qthttpserver-everywhere-src-6.7.1.tar.xz"; }; }; qtimageformats = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz"; - sha256 = "19r9q233pwiqqf57khdv1qfnjkqxnzfk7zhnk32i2nnxr1zf0v2i"; - name = "qtimageformats-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtimageformats-everywhere-src-6.7.1.tar.xz"; + sha256 = "17z7vywfs4qqkyzqmfj8jis84f8l4bw6323b8w0d0r0hfy7vjcx7"; + name = "qtimageformats-everywhere-src-6.7.1.tar.xz"; }; }; qtlanguageserver = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz"; - sha256 = "1z69fqgqbbipwfhlabs0z6axx4br1a1qjk404jnbgxxx58scp7m9"; - name = "qtlanguageserver-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlanguageserver-everywhere-src-6.7.1.tar.xz"; + sha256 = "1yclzaj93ygy5kyxi4ri6i8yzxwlikkn0hldszci03knchadmz50"; + name = "qtlanguageserver-everywhere-src-6.7.1.tar.xz"; }; }; qtlocation = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlocation-everywhere-src-6.7.0.tar.xz"; - sha256 = "0snl7a8fax0771hqaa0g653f0428x7c546zc4vsrinqppik4s15v"; - name = "qtlocation-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlocation-everywhere-src-6.7.1.tar.xz"; + sha256 = "02464sv5gg8z5pmnwjba584fqw1vi0xlzlish9gs7zf95s61fw1q"; + name = "qtlocation-everywhere-src-6.7.1.tar.xz"; }; }; qtlottie = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlottie-everywhere-src-6.7.0.tar.xz"; - sha256 = "1vd27g93kjala7849ny3n4nw0xg2j7ba2i682fyhdq4r7kggn3ww"; - name = "qtlottie-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtlottie-everywhere-src-6.7.1.tar.xz"; + sha256 = "0z52jh4mw1pqvcldblwn4igq888hg0p1bgnhndi89rnkrdli1pka"; + name = "qtlottie-everywhere-src-6.7.1.tar.xz"; }; }; qtmultimedia = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtmultimedia-everywhere-src-6.7.0.tar.xz"; - sha256 = "0w4c0yyzgfhm6vd4qkxllh2cqw5q3giybqf9n2iyckixkvjbm57k"; - name = "qtmultimedia-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtmultimedia-everywhere-src-6.7.1.tar.xz"; + sha256 = "0gndclyixwj0g5yzfpamr2fi0q288nn4h9gy76yz2nvzf91iavb5"; + name = "qtmultimedia-everywhere-src-6.7.1.tar.xz"; }; }; qtnetworkauth = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtnetworkauth-everywhere-src-6.7.0.tar.xz"; - sha256 = "0iaalz7kpbjzjcrf5nmcw7322mq381s4jakfh8yks8phdxhhaccr"; - name = "qtnetworkauth-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtnetworkauth-everywhere-src-6.7.1.tar.xz"; + sha256 = "0pap87c4km4isygmhdmamrfhis69jdj6j2fjgccxsb2gqc2klaq1"; + name = "qtnetworkauth-everywhere-src-6.7.1.tar.xz"; }; }; qtpositioning = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtpositioning-everywhere-src-6.7.0.tar.xz"; - sha256 = "1pwxc2fhwvmq0mwrv9fak3d1bh23b7maxshyp0fs1j167jj1nq0x"; - name = "qtpositioning-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtpositioning-everywhere-src-6.7.1.tar.xz"; + sha256 = "0lsgh01bnca766h3iv55fc9arrrd9ck25zlfgkljclfkp130sasw"; + name = "qtpositioning-everywhere-src-6.7.1.tar.xz"; }; }; qtquick3d = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3d-everywhere-src-6.7.0.tar.xz"; - sha256 = "046rgvvf4a37b0anqn1h814231ibw8kxk4yd9yvk7ab57yzl7fcb"; - name = "qtquick3d-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquick3d-everywhere-src-6.7.1.tar.xz"; + sha256 = "1s9zm6akk8c0r30mabdipqybhdxihq4riapxph221nmvgz60sfff"; + name = "qtquick3d-everywhere-src-6.7.1.tar.xz"; }; }; qtquick3dphysics = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; - sha256 = "1rh41sadi5l2yypskhwrcjii0llkdq2msh0bgj0g7wq924k5y140"; - name = "qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquick3dphysics-everywhere-src-6.7.1.tar.xz"; + sha256 = "0xdxrx41f4kssjnmwrj1fza3zbr5awc73mbbb9gqxc43k11523rg"; + name = "qtquick3dphysics-everywhere-src-6.7.1.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; - sha256 = "1m84pjw4d2gvypgajz21xcl9di1vmswqwb0nd763bjk181kfq3rx"; - name = "qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz"; + sha256 = "1qindhqqsp9y5gf82jga1fyvs81l1pli8b3rf5f4a9pqg6n140jb"; + name = "qtquickeffectmaker-everywhere-src-6.7.1.tar.xz"; }; }; qtquicktimeline = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquicktimeline-everywhere-src-6.7.0.tar.xz"; - sha256 = "1gc96jva2nm7a3zv5zwmhrvifjlngngddm3kaivmfpbbdiy6aigb"; - name = "qtquicktimeline-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtquicktimeline-everywhere-src-6.7.1.tar.xz"; + sha256 = "0i2pf9a1y50589ly00qaiik8q7ydmw2vf6jg2nq3r8dphx6j0y9d"; + name = "qtquicktimeline-everywhere-src-6.7.1.tar.xz"; }; }; qtremoteobjects = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtremoteobjects-everywhere-src-6.7.0.tar.xz"; - sha256 = "15f6wjszl5mxjrjd8r36l3x3p1nzhgib33bb7743ywf94pb61fm0"; - name = "qtremoteobjects-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtremoteobjects-everywhere-src-6.7.1.tar.xz"; + sha256 = "1x6c95wkxd28a2dplv0956rqfr5kw96f33aqvncxcm7qp80jn0g7"; + name = "qtremoteobjects-everywhere-src-6.7.1.tar.xz"; }; }; qtscxml = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtscxml-everywhere-src-6.7.0.tar.xz"; - sha256 = "0z15m5l44asp4masjxmkxqcc4x93v6n8i12qswrzfvbnp2xrfnvj"; - name = "qtscxml-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtscxml-everywhere-src-6.7.1.tar.xz"; + sha256 = "0kxjcx8rp8g6rrg153xwakr3jbm1accgjmzahxkbv2g8hi942b82"; + name = "qtscxml-everywhere-src-6.7.1.tar.xz"; }; }; qtsensors = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsensors-everywhere-src-6.7.0.tar.xz"; - sha256 = "1axwywwgygcri1pfjyaiqa7hd7kivya0gr0q11v4z9ih18h1ac0w"; - name = "qtsensors-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtsensors-everywhere-src-6.7.1.tar.xz"; + sha256 = "1wpv1p43h40pmmy8wya6f92aysyp9z0w3yfs2af06w8gv4bllsfm"; + name = "qtsensors-everywhere-src-6.7.1.tar.xz"; }; }; qtserialbus = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz"; - sha256 = "1pbnpfazgpaqzi1sz141sh9sqygibb25crk7byjzhr06hslr70a9"; - name = "qtserialbus-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtserialbus-everywhere-src-6.7.1.tar.xz"; + sha256 = "13v2anjsdwkkm4clkcinih2118vg5nm9dafpr47h86xq8pahafai"; + name = "qtserialbus-everywhere-src-6.7.1.tar.xz"; }; }; qtserialport = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz"; - sha256 = "1jc1g46pgjy39vyk7inzx0kx6iziy54kgjkwz8pvmj4wihyjmw5i"; - name = "qtserialport-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtserialport-everywhere-src-6.7.1.tar.xz"; + sha256 = "11jqx8j62dyd5n63222zwpk5n7sg45laa6qi98p2ylpxidwa6hz5"; + name = "qtserialport-everywhere-src-6.7.1.tar.xz"; }; }; qtshadertools = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz"; - sha256 = "1bwqg5gn2nfm61950yhcv9q93qd2fb2cnm77074ia21gqrkzj4ry"; - name = "qtshadertools-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtshadertools-everywhere-src-6.7.1.tar.xz"; + sha256 = "1hhhg7qs28mdd9s8wah2qvpkv7760jd4i10s37cbmqmjhnly71g5"; + name = "qtshadertools-everywhere-src-6.7.1.tar.xz"; }; }; qtspeech = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtspeech-everywhere-src-6.7.0.tar.xz"; - sha256 = "048z7lqvpqi4073lx7s83d9kqbfg59banapi7qiw4j3xhfx8wxj4"; - name = "qtspeech-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtspeech-everywhere-src-6.7.1.tar.xz"; + sha256 = "127ba7vqqrgg7hw2c0aix3qk8vn5xh3ilh7w1k5za3pwr0aisvvc"; + name = "qtspeech-everywhere-src-6.7.1.tar.xz"; }; }; qtsvg = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz"; - sha256 = "0bcjpwzggrqp2gf9a1xp8g0klh9kn2amnvp2lr9n2ppz107g860m"; - name = "qtsvg-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtsvg-everywhere-src-6.7.1.tar.xz"; + sha256 = "1knb0xc662ajikbhsg1j3i6j4g97xn2759dpcga1vi18f87vim9y"; + name = "qtsvg-everywhere-src-6.7.1.tar.xz"; }; }; qttools = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz"; - sha256 = "0yzfmfqwn0y534z47yyk71236nnsq0v0kgsw8qiixzl2kqinpnn8"; - name = "qttools-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qttools-everywhere-src-6.7.1.tar.xz"; + sha256 = "094qv7mpzi3g9cbrlwix8qzfp64a5s4h82d1g699bws8cbgwslq9"; + name = "qttools-everywhere-src-6.7.1.tar.xz"; }; }; qttranslations = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttranslations-everywhere-src-6.7.0.tar.xz"; - sha256 = "0mjbx9n8fh4xp9r0r4p9ynjy1iirzn3bwlyr3g6vm91c0r3q1z16"; - name = "qttranslations-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qttranslations-everywhere-src-6.7.1.tar.xz"; + sha256 = "1x7vwj4f3sddq5g3mpfvyqigkc0s0ggp341l0drhw3ibhxjibmq3"; + name = "qttranslations-everywhere-src-6.7.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; - sha256 = "0snbl1wd5s76c8ab76bsqi3bp94h1isdwavbjm6gc1hvifhv46yn"; - name = "qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz"; + sha256 = "0pd8rg6qn3grlari3lgj46b85l5r6sal5g9qkf82yqkz3cyxhv3v"; + name = "qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz"; }; }; qtwayland = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz"; - sha256 = "1sks2m2phf841zl0d4sn7krm6f1ppgl7wl9arpc8i8vx47j70d6p"; - name = "qtwayland-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwayland-everywhere-src-6.7.1.tar.xz"; + sha256 = "081xm13gvkxg5kv9yhwlxwixcc1wz0vas7arivfhxj81wyl7dwby"; + name = "qtwayland-everywhere-src-6.7.1.tar.xz"; }; }; qtwebchannel = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebchannel-everywhere-src-6.7.0.tar.xz"; - sha256 = "1zzg49ii59sw64m98phsbhf97kx7nxp7k0ggxazbz0hc9r0bvgr6"; - name = "qtwebchannel-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebchannel-everywhere-src-6.7.1.tar.xz"; + sha256 = "0vyc5mfjhsyj147wxg3ldlcn3bm895p961akcc2cw2z9zknrbndr"; + name = "qtwebchannel-everywhere-src-6.7.1.tar.xz"; }; }; qtwebengine = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebengine-everywhere-src-6.7.0.tar.xz"; - sha256 = "1pj7q5r8wa49faxijljfnbmzbpmqc7bwcal0mcwz9haxcd1s8nqs"; - name = "qtwebengine-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebengine-everywhere-src-6.7.1.tar.xz"; + sha256 = "0i6w4783yz58aqxidzaz69k698344fn2h5wm1sdr8zcsc0981w2k"; + name = "qtwebengine-everywhere-src-6.7.1.tar.xz"; }; }; qtwebsockets = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz"; - sha256 = "0dlp2ck0pkg9say92qism438i5j3ybxs0xf90j7g3k9ndgd7gz2z"; - name = "qtwebsockets-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebsockets-everywhere-src-6.7.1.tar.xz"; + sha256 = "1szy09vayk5ifd22mpz4zvwwgr5sjz3cawgnaqmcf6dqsbjac5py"; + name = "qtwebsockets-everywhere-src-6.7.1.tar.xz"; }; }; qtwebview = { - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebview-everywhere-src-6.7.0.tar.xz"; - sha256 = "1yawx8vd7blky5b8mxpby4k1zwgm91jvl98y17xf47yc71qy069n"; - name = "qtwebview-everywhere-src-6.7.0.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.1/submodules/qtwebview-everywhere-src-6.7.1.tar.xz"; + sha256 = "0swhdh3xvx82wz337lzwwi34xcq9na9hqnisraqxcd1p7qdqzkk4"; + name = "qtwebview-everywhere-src-6.7.1.tar.xz"; }; }; } From 3ff593a54d58295b5940207dea2fb4b6923928a3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 21 May 2024 13:37:19 +0300 Subject: [PATCH 65/90] raycast: 1.74.0 -> 1.74.1 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index da73099da861..302acad3100d 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.74.0"; + version = "1.74.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-aPpxPjEhy1uLekHMLyI18mlSozffMA+HB1OdqpULVnw="; + hash = "sha256-vIhuXZ9FxpWLPoOciyl4Qe0G8vXY+to+CGxp+nRmyp8="; }; dontPatch = true; From 567125c65ad1b38ace66f0c4d1434a96ade039d5 Mon Sep 17 00:00:00 2001 From: alina sireneva Date: Mon, 20 May 2024 23:28:12 +0300 Subject: [PATCH 66/90] jikespg: fixed darwin build --- pkgs/development/tools/parsing/jikespg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index aec4682cec2e..1c67521608b5 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + substituteInPlace Makefile --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-std=c89"}" ''; sourceRoot = "jikespg/src"; From be774f013b27225880d8e60796b1bd00b8a87dd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 11:50:30 +0000 Subject: [PATCH 67/90] obs-studio-plugins.advanced-scene-switcher: 1.26.1 -> 1.26.2 --- .../obs-studio/plugins/advanced-scene-switcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 134aabbbf058..102eff7e83b7 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-nig6MBPorKz/mZ7t4SbcW00ukEV9DWVDLAOgWX53xoo="; + hash = "sha256-x9wk4tqCXufHSb/ssUxjm0o6JrZzXnIk+adIn/YI9Qk="; }; nativeBuildInputs = [ From e971750c2466440366730f1330ae321278f27d85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:57:00 +0200 Subject: [PATCH 68/90] python312Packages.crownstone-sse: 2.0.4 -> 2.0.5 --- .../python-modules/crownstone-sse/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index ca2cd4e0d154..f801547d48b8 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -2,25 +2,24 @@ , aiohttp , buildPythonPackage , certifi -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "crownstone-sse"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "crownstone"; - repo = "crownstone-lib-python-sse"; - rev = version; - hash = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c="; + src = fetchPypi { + pname = "crownstone_sse"; + inherit version; + hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; - propagatedBuildInputs = [ + dependencies = [ aiohttp certifi ]; @@ -34,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for listening to Crownstone SSE events"; - homepage = "https://github.com/crownstone/crownstone-lib-python-sse"; + homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From ee6abbad3bab49f7adcc00fe57ae07156d3cfe3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:59:16 +0200 Subject: [PATCH 69/90] python312Packages.crownstone-sse: refactor --- pkgs/development/python-modules/crownstone-sse/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index f801547d48b8..3a7947458986 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -4,12 +4,13 @@ , certifi , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "crownstone-sse"; version = "2.0.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; + build-system = [ + setuptools + ]; + dependencies = [ aiohttp certifi From f0f3609dd58796ec100b8d2f0228ddb98a5c7c29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:59:33 +0200 Subject: [PATCH 70/90] python312Packages.crownstone-sse: format with nixfmt --- .../python-modules/crownstone-sse/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index 3a7947458986..82f106d8f9ec 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -1,10 +1,11 @@ -{ lib -, aiohttp -, buildPythonPackage -, certifi -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + certifi, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,9 +21,7 @@ buildPythonPackage rec { hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -32,9 +31,7 @@ buildPythonPackage rec { # Tests are only providing coverage doCheck = false; - pythonImportsCheck = [ - "crownstone_sse" - ]; + pythonImportsCheck = [ "crownstone_sse" ]; meta = with lib; { description = "Python module for listening to Crownstone SSE events"; From a854d724c4618b27872171e62db17353769f1ee7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:03:27 +0200 Subject: [PATCH 71/90] python312Packages.crownstone-cloud: 1.4.9 -> 1.4.11 --- .../crownstone-cloud/default.nix | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index d8ee18a090d4..9ceabd797ec7 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,8 +1,7 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub -, fetchpatch +, fetchPypi , certifi , pythonOlder , pytestCheckHook @@ -10,27 +9,17 @@ buildPythonPackage rec { pname = "crownstone-cloud"; - version = "1.4.9"; + version = "1.4.11"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "crownstone"; - repo = "crownstone-lib-python-cloud"; - rev = "refs/tags/${version}"; - hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; + src = fetchPypi { + pname = "crownstone_cloud"; + inherit version; + hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - patches = [ - # Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch"; - hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8="; - }) - ]; - propagatedBuildInputs = [ aiohttp certifi @@ -50,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices"; - homepage = "https://github.com/crownstone/crownstone-lib-python-cloud"; + homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From baeeded2c6de36a9d47615455d583ffb3eeda1ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:06:55 +0200 Subject: [PATCH 72/90] python312Packages.crownstone-cloud: refactor --- .../python-modules/crownstone-cloud/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 9ceabd797ec7..851cbdb39613 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -5,12 +5,13 @@ , certifi , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "crownstone-cloud"; version = "1.4.11"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp certifi ]; @@ -29,10 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - sed -i '/codecov/d' requirements.txt - ''; - pythonImportsCheck = [ "crownstone_cloud" ]; @@ -40,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices"; homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From a1f4cd3113870138d1a9632580b1ffbb90255e00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:07:35 +0200 Subject: [PATCH 73/90] python312Packages.crownstone-cloud: format with nixfmt --- .../crownstone-cloud/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 851cbdb39613..089d60fceb6f 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchPypi -, certifi -, pythonOlder -, pytestCheckHook -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchPypi, + certifi, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { @@ -21,22 +22,16 @@ buildPythonPackage rec { hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp certifi ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "crownstone_cloud" - ]; + pythonImportsCheck = [ "crownstone_cloud" ]; meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices"; From ddc323abffac8c95121bfca839fce3a4f96532ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 12:23:42 +0000 Subject: [PATCH 74/90] gamescope: 3.14.15 -> 3.14.16 --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 083ae3f6b3c3..3b60a9f40715 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -44,14 +44,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.15"; + version = "3.14.16"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-K7Sz5HWelHZoc6gPFBDfymjn8P7mWNX6FuyaL4t6qeI="; + hash = "sha256-tijFVOIMW+nkot/uRP0PNZBYZkZMMt1PcAN5+3SWzW4="; }; patches = [ From ccf57ee1ec618e8ff15b53d15acce59167dcded9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:33:20 +0200 Subject: [PATCH 75/90] python312Packages.lnkparse3: 1.4.0 -> 1.5.0 Diff: https://github.com/Matmaus/LnkParse3/compare/refs/tags/v1.4.0...v1.5.0 Changelog: https://github.com/Matmaus/LnkParse3/blob/1.5.0/CHANGELOG.md --- pkgs/development/python-modules/lnkparse3/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index 94fd7aaee190..ffeb5c7cb86c 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pyyaml , setuptools }: buildPythonPackage rec { pname = "lnkparse3"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,13 +18,17 @@ buildPythonPackage rec { owner = "Matmaus"; repo = "LnkParse3"; rev = "refs/tags/v${version}"; - hash = "sha256-aWMkLFbmikdj4mlAPpo0qrxfE8zgRcSV83aiws03XsQ="; + hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + pyyaml + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 9f9610c3140b4a0321451f9fe6bf3989137f537f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:34:15 +0200 Subject: [PATCH 76/90] python312Packages.lnkparse3: format with nixfmt --- .../python-modules/lnkparse3/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index ffeb5c7cb86c..c6fd742f27be 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, pyyaml -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pyyaml, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - pyyaml - ]; + propagatedBuildInputs = [ pyyaml ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "LnkParse3" - ]; + pythonImportsCheck = [ "LnkParse3" ]; meta = with lib; { description = "Windows Shortcut file (LNK) parser"; From 6aea91e153aae4c2e9bb59068a9c20caef56bab1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:35:32 +0200 Subject: [PATCH 77/90] python312Packages.lnkparse3: refactor --- pkgs/development/python-modules/lnkparse3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index c6fd742f27be..70d541fe52d8 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -22,9 +22,9 @@ buildPythonPackage rec { hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pyyaml ]; + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook ]; From 486219cc137b90a97b1607691ff9a04b694ba609 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:39:58 +0200 Subject: [PATCH 78/90] python312Packages.pycookiecheat: 0.6.0 -> 0.7.0 Diff: https://github.com/n8henrie/pycookiecheat/compare/refs/tags/v0.6.0...v0.7.0 Changelog: https://github.com/n8henrie/pycookiecheat/blob/v0.7.0/CHANGELOG.md --- .../python-modules/pycookiecheat/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index 4a539f5ee191..db2bef5f8cc0 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pycookiecheat"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "n8henrie"; repo = "pycookiecheat"; rev = "refs/tags/v${version}"; - hash = "sha256-mSc5FqMM8BICVEdSdsIny9Bnk6qCRekPk4RkBusDoVA="; + hash = "sha256-x568e4M7fz93hq0y06Grz9GlrjGV38GxWd+PhNiAyBY="; }; pythonRelaxDeps = [ @@ -57,12 +57,13 @@ buildPythonPackage rec { disabledTests = [ # Tests want to use playwright executable - "test_no_cookies" "test_fake_cookie" "test_firefox_cookies" - "test_load_firefox_cookie_db" - "test_firefox_no_cookies" "test_firefox_get_default_profile" + "test_firefox_no_cookies" + "test_load_firefox_cookie_db" + "test_no_cookies" + "test_warns_for_string_browser" ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; From 7c348f0ab6647b33996810747cf665413b351460 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 21 May 2024 15:43:05 +0300 Subject: [PATCH 79/90] qt6.qtmqtt: 6.7.0 -> 6.7.1 --- pkgs/development/libraries/qt-6/modules/qtmqtt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index fc12a5fb1112..df105c8baa3a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.7.0"; + version = "6.7.1"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-LUYb4Wb1fLUwIvDOsVU/iSOyx9pcfPrmiFnQskbT2d8="; + hash = "sha256-Dl+ZJjQU0vHurnhRVMYh0ry74iXb27Zld5dT21AxVhI="; }; propagatedBuildInputs = [ qtbase ]; From 22c9a528315dad96f7dbc9bb4757503fe6b01996 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:45:44 +0200 Subject: [PATCH 80/90] python312Packages.pycookiecheat: refactor --- .../python-modules/pycookiecheat/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index db2bef5f8cc0..3d0a0f8d5d97 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , cryptography , fetchFromGitHub @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pycookiecheat"; version = "0.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,13 +31,16 @@ buildPythonPackage rec { "keyring" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ cryptography keyring ]; From f6a9c1fede7dd66ce8bacf928ade552a93183ca2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:52:10 +0200 Subject: [PATCH 81/90] python312Packages.pycookiecheat: format with nixfmt --- .../python-modules/pycookiecheat/default.nix | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index 3d0a0f8d5d97..3a1c3efdf3cd 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, buildPythonPackage -, cryptography -, fetchFromGitHub -, keyring -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, playwright -, setuptools -, setuptools-scm +{ + lib, + stdenv, + buildPythonPackage, + cryptography, + fetchFromGitHub, + keyring, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + playwright, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "n8henrie"; @@ -36,9 +37,7 @@ buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ cryptography @@ -50,9 +49,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "pycookiecheat" - ]; + pythonImportsCheck = [ "pycookiecheat" ]; preCheck = '' export HOME=$(mktemp -d) @@ -67,9 +64,7 @@ buildPythonPackage rec { "test_load_firefox_cookie_db" "test_no_cookies" "test_warns_for_string_browser" - ] ++ lib.optionals stdenv.isDarwin [ - "test_slack_config" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "test_slack_config" ]; meta = with lib; { description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; From 1f1a9bb15d60905d1d52f49f5e153e6279124e26 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 13 May 2024 13:11:38 +0100 Subject: [PATCH 82/90] netscanner: 0.4.5 -> 0.5.1 --- pkgs/by-name/ne/netscanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 01dd71d3ca21..e1d81cf5a914 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.4.5"; + version = "0.5.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-mR+jazZ2Xnf5xuWbVrFCfGOR+sjEUWL3WqHJynIHVFQ="; + hash = "sha256-iRVmazOiUvpl29A0Ju0e2mzFRJtQD7ViY22Jai005nY="; }; - cargoHash = "sha256-+FTbvS4wqBjEL+uWYKhHQp0uMmrvVPYwxdQeZ4cWrhw="; + cargoHash = "sha256-oH+rU8IZwC8aZ320bIehddPq/+9IYQs+AlZe94LHNYk="; postFixup = '' wrapProgram $out/bin/netscanner \ From dfcccd136664dacabb84363536cdf12d705bcc7e Mon Sep 17 00:00:00 2001 From: zach Date: Mon, 13 May 2024 12:11:53 -0700 Subject: [PATCH 83/90] extism-cli: 1.3.0 -> 1.4.0 Update default.nix Co-authored-by: Peder Bergebakken Sundt --- pkgs/development/tools/extism-cli/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index ebdce3ef60b8..b9ca4160fe3e 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,21 +7,21 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-wHEbTK7bYFOI+I7vQqgku4nkpD87zD7SoU/wpmHqets="; + hash = "sha256-F+Kb9ZAgHkw5kcOSt2Q8Lm+B8B4VPkr4FVYbe6HD+is="; }; - modRoot = "./extism"; - - vendorHash = "sha256-js8A0AQPpcj1nBNUiSFJ0OlrqDD7AbV/UNHvxBfHG6c="; + vendorHash = "sha256-/faWWYwY7oxbIOoqpyXC+EU4gECl/o34M+SFyfMOWj8="; nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "./extism" ]; + doCheck = false; # Tests require network access postInstall = '' From ddd0c8f0e140af21a779ffb818e2657f1aae34c0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 20 May 2024 09:34:17 +0200 Subject: [PATCH 84/90] liblapin: init at 0-unstable-2024-05-20 --- pkgs/by-name/li/liblapin/package.nix | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/li/liblapin/package.nix diff --git a/pkgs/by-name/li/liblapin/package.nix b/pkgs/by-name/li/liblapin/package.nix new file mode 100644 index 000000000000..97bcb1d1e181 --- /dev/null +++ b/pkgs/by-name/li/liblapin/package.nix @@ -0,0 +1,59 @@ +{ + stdenv, + lib, + fetchFromGitHub, + sfml, + libffcall, + libusb-compat-0_1, + libudev-zero, +}: + +stdenv.mkDerivation { + name = "liblapin"; + version = "0-unstable-2024-05-20"; + + src = fetchFromGitHub { + owner = "Damdoshi"; + repo = "LibLapin"; + rev = "27955d24f3efd10fe4f556a4f292d731813d3de3"; + hash = "sha256-h8LuhTgFOFnyDeFeoEanD64/nmDyLeh6R9tw9X6GP8g="; + }; + + prePatch = '' + # camera module fails to build with opencv, due to missing V4L2 support + rm -rf src/camera + + substituteInPlace Makefile \ + --replace-fail "/bin/echo" "echo" + ''; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm644 liblapin.a $out/lib/liblapin.a + + rm -rf include/private + cp -r include $out + + runHook postInstall + ''; + + buildInputs = [ + sfml + libffcall + libusb-compat-0_1 + libudev-zero + ]; + + outputs = [ "out" "dev" ]; + + meta = { + description = "Multimedia library for rookies and prototyping"; + homepage = "https://liblapin.org?lan=en"; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} From 4212454a63fe8dc092f6901dd95b9809ea7354f4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 21 May 2024 16:04:19 +0200 Subject: [PATCH 85/90] alephone-marathon: disable nixpkgs-update Every Alephone release updates the version of the game data regardless if the data changes. close #313365 close #313366 close #313367 --- pkgs/by-name/al/alephone-durandal/package.nix | 1 + pkgs/by-name/al/alephone-infinity/package.nix | 1 + pkgs/by-name/al/alephone-marathon/package.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/by-name/al/alephone-durandal/package.nix b/pkgs/by-name/al/alephone-durandal/package.nix index b1bd2da8c8a3..6f49e76ad43f 100644 --- a/pkgs/by-name/al/alephone-durandal/package.nix +++ b/pkgs/by-name/al/alephone-durandal/package.nix @@ -6,6 +6,7 @@ alephone.makeWrapper rec { version = "20240510"; icon = alephone.icons + "/marathon2.png"; + # nixpkgs-update: no auto update zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; diff --git a/pkgs/by-name/al/alephone-infinity/package.nix b/pkgs/by-name/al/alephone-infinity/package.nix index d2ba3968f595..2b8d0b92ab45 100644 --- a/pkgs/by-name/al/alephone-infinity/package.nix +++ b/pkgs/by-name/al/alephone-infinity/package.nix @@ -6,6 +6,7 @@ alephone.makeWrapper rec { version = "20240510"; icon = alephone.icons + "/marathon-infinity.png"; + # nixpkgs-update: no auto update zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; diff --git a/pkgs/by-name/al/alephone-marathon/package.nix b/pkgs/by-name/al/alephone-marathon/package.nix index 4710d47090d5..928fe4f6ce84 100644 --- a/pkgs/by-name/al/alephone-marathon/package.nix +++ b/pkgs/by-name/al/alephone-marathon/package.nix @@ -6,6 +6,7 @@ alephone.makeWrapper rec { version = "20240510"; icon = alephone.icons + "/marathon.png"; + # nixpkgs-update: no auto update zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; From f26e8f439c4a335989a00542b479fecc223ff4d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 14:41:37 +0000 Subject: [PATCH 86/90] llama-cpp: 2901 -> 2953 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 0800cb2eaa2e..5488e10a87f6 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -72,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2901"; + version = "2953"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-bsPqSvJ9/iXE/wu+8kHikt1YPxX5XC+WsPbXTuSlsAo="; + hash = "sha256-IqR0tdTdrydrMCgOfNbRnVESN3pEzti3bAuTH9i3wQQ="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From 6397ca49b73d6593397716ebbb3e6dcb9fa439fb Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Tue, 21 May 2024 17:21:21 +0200 Subject: [PATCH 87/90] =?UTF-8?q?kaufkauflist:=203.3.0=20=E2=86=92=204.0.0?= =?UTF-8?q?=20(#310337)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/kaufkauflist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix index e7e462caf791..fee38a8a9483 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -21,17 +21,17 @@ let }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-kqDNA+BALVMrPZleyPxxCyls4VKBzY2MttzO51+Ixo8="; + hash = "sha256-x30K2dYxawfebdq//9OmCCG48w0V04tDTXpvRW7lfJI="; }; - npmDepsHash = "sha256-O2fcmC7Hj9JLStMukyt12aMgntjXT7Lv3vYJp3GqO24="; + npmDepsHash = "sha256-E3AXFwiRvrE2Swt7BfSfAoU5mQplSaSJ4q56pVfoEkQ="; ESBUILD_BINARY_PATH = lib.getExe esbuild'; From 3df8dcc487f2838e62a040e5abf9bbd9ee823720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 16:00:34 +0000 Subject: [PATCH 88/90] telegraf: 1.30.2 -> 1.30.3 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 92cb7dee4ec4..a2ded0f652a7 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.30.2"; + version = "1.30.3"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-y9FfCCOUl0IWwcol1aDG+1m7270wWc3akhZzaK/KItY="; + hash = "sha256-B3Eeh3eOYg58NnMpV6f04HFzOtOn/enBqzCJRst6u2U="; }; - vendorHash = "sha256-7X2k/fpr9zQNXfyd+18VpRTcmYvPBvQzPNolNfmIZG8="; + vendorHash = "sha256-Cudnc5ZyCQUqgao58ww69gfF6tPW6/oGP9zXbuPSTAE="; proxyVendor = true; ldflags = [ From c2bdcca62e72571e2b4956b8ca60a00f3485901c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 21 May 2024 18:03:49 +0200 Subject: [PATCH 89/90] vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.12 -> 0.8.13 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fad42392d45e..1eeb0fdf8947 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3700,8 +3700,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.12"; - hash = "sha256-4Iq6idux029i7cBV3x79ZRAbSk3ymqx+Q2jv0zV9ZTI="; + version = "0.8.13"; + hash = "sha256-DxM7oWAbIonsKTvJjxX4oTaBwvRcxNT2y10ljYAzVeI="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; From d62141d024493276446fed8faf92dcc29d51a049 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 21 May 2024 16:12:35 +0000 Subject: [PATCH 90/90] pietrasanta-traceroute: init at `0.0.5-unstable-2023-11-28` (#313400) --- .../pi/pietrasanta-traceroute/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/pi/pietrasanta-traceroute/package.nix diff --git a/pkgs/by-name/pi/pietrasanta-traceroute/package.nix b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix new file mode 100644 index 000000000000..fef33f4b1ba3 --- /dev/null +++ b/pkgs/by-name/pi/pietrasanta-traceroute/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, unstableGitUpdater +, stdenv +, openssl +}: + +stdenv.mkDerivation rec { + pname = "pietrasanta-traceroute"; + version = "0.0.5-unstable-2023-11-28"; + + src = fetchFromGitHub { + owner = "catchpoint"; + repo = "Networking.traceroute"; + rev = "c870c7bd7bafeab815f8564a67a281892c3a6230"; + hash = "sha256-CKqm8b6qNLEpso25+uTvtiR/hFMKJzuXUZkQ7lWzGd8="; + }; + passthru.updateScript = unstableGitUpdater { }; + + buildInputs = [ openssl ]; + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "ECN-aware version of traceroute"; + longDescription = '' + An enhanced version of Dmitry Butskoy's traceroute, developed by Catchpoint. + - Support for "TCP InSession": opens a TCP connection with the destination and sends TCP probes with + increasing TTL values, to prevent false packet loss introduced by firewalls, and ensure packets + follow a single flow, akin to a normal TCP session. + - Similar QUIC-based traceroute. + - Enhanced ToS (DSCP/ECN) field report. + ''; + homepage = "https://github.com/catchpoint/Networking.traceroute/"; + changelog = "https://github.com/catchpoint/Networking.traceroute/blob/${src.rev}/ChangeLog"; + license = with licenses; [ gpl2Only lgpl21Only ]; + mainProgram = "traceroute"; + maintainers = with maintainers; [ nicoo ]; + platforms = platforms.all; + }; +}