From 2ec46d71212e0b74c9616f13c9482d9093cc2b65 Mon Sep 17 00:00:00 2001 From: David Whiting Date: Mon, 6 May 2024 10:44:13 +0100 Subject: [PATCH 01/97] pdfstudio: added 2024.0.0 Also modified how it is called in all-packages.nix to pass the by-name check. --- pkgs/applications/misc/pdfstudio/default.nix | 14 +++++++++++++ pkgs/top-level/all-packages.nix | 21 +++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 21874519a7c7b..8ba5610222af2 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -77,4 +77,18 @@ in }; jdk = jdk17; }; + + pdfstudio2024 = callPackage ./common.nix rec { + inherit desktopName longDescription pname program year; + version = "${year}.0.0"; + src = fetchurl { + url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; + sha256 = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM="; + }; + extraBuildInputs = [ + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + ]; + jdk = jdk17; + }; + }.${pname} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0069567d1fb2f..048421b2aaff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29659,13 +29659,20 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; - - pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; }; - - pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; }; - - pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; }; + inherit + ({ + pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; + pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; }; + pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; }; + pdfstudio2024 = callPackage ../applications/misc/pdfstudio { year = "2024"; }; + pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; }; + }) + pdfstudio2021 + pdfstudio2022 + pdfstudio2023 + pdfstudio2024 + pdfstudioviewer + ; abaddon = callPackage ../applications/networking/instant-messengers/abaddon { }; From 75775507721e12796782900eff29ab71f01cb37b Mon Sep 17 00:00:00 2001 From: AveryanAlex Date: Thu, 1 Aug 2024 20:59:20 +0300 Subject: [PATCH 02/97] amneziawg-go: init at 0.2.12 --- pkgs/by-name/am/amneziawg-go/package.nix | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/am/amneziawg-go/package.nix diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix new file mode 100644 index 0000000000000..fa5f47cffa81d --- /dev/null +++ b/pkgs/by-name/am/amneziawg-go/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "amneziawg-go"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "amnezia-vpn"; + repo = "amneziawg-go"; + rev = "v${version}"; + hash = "sha256-Xw2maGmNnx0+GO3OWS1Gu77oB9wh2dv+WobypQotUMA="; + }; + + postPatch = '' + # Skip formatting tests + rm -f format_test.go + ''; + + vendorHash = "sha256-zXd9PK3fpOx/YjCNs2auZWhbLUk2fO6tyLV5FxAH0us="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Userspace Go implementation of AmneziaWG"; + homepage = "https://github.com/amnezia-vpn/amneziawg-go"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ averyanalex ]; + mainProgram = "amneziawg-go"; + }; +} From b1863411fdffe8bdeac6feafb011c05015de6c01 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 20 Aug 2024 09:09:47 +0100 Subject: [PATCH 03/97] duckstation-bin: init at 0.1-7294 --- pkgs/by-name/du/duckstation-bin/package.nix | 45 +++++++++++++++++++++ pkgs/by-name/du/duckstation-bin/update.sh | 20 +++++++++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/by-name/du/duckstation-bin/package.nix create mode 100755 pkgs/by-name/du/duckstation-bin/update.sh diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix new file mode 100644 index 0000000000000..2deddb86cbe07 --- /dev/null +++ b/pkgs/by-name/du/duckstation-bin/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "duckstation-bin"; + version = "0.1-7294"; + + src = fetchurl { + url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; + hash = "sha256-33aipZjYJOquQBbe8Ve9KRfLGW29v9xoztUsaY8LAjw="; + }; + + nativeBuildInputs = [ unzip ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r DuckStation.app $out/Applications/DuckStation.app + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://github.com/stenzek/duckstation"; + description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; + changelog = "https://github.com/stenzek/duckstation/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/du/duckstation-bin/update.sh b/pkgs/by-name/du/duckstation-bin/update.sh new file mode 100755 index 0000000000000..50d6017f7cccd --- /dev/null +++ b/pkgs/by-name/du/duckstation-bin/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused + +set -euo pipefail + +cd "$(dirname "$0")" || exit 1 + +# Grab latest version, ignoring "latest" and "preview" tags +LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/stenzek/duckstation/releases" | jq -r '.[].tag_name' | grep '^v' | head -n 1 | sed 's/^v//')" +CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" + +if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then + echo "duckstation-bin is up-to-date" + exit 0 +fi + +HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/v${LATEST_VER}/duckstation-mac-release.zip")")" + +sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix +sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix From ca5dd27a4d858735de131c6c99d1aebf35dae528 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:27:16 +0200 Subject: [PATCH 04/97] simple64: init at 2024.09.1 --- .../add-official-server-error-message.patch | 15 +++ .../simple64/dont-use-vosk-and-discord.patch | 37 +++++++ pkgs/by-name/si/simple64/package.nix | 101 ++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 pkgs/by-name/si/simple64/add-official-server-error-message.patch create mode 100644 pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch create mode 100644 pkgs/by-name/si/simple64/package.nix diff --git a/pkgs/by-name/si/simple64/add-official-server-error-message.patch b/pkgs/by-name/si/simple64/add-official-server-error-message.patch new file mode 100644 index 0000000000000..7d37e33c11d1a --- /dev/null +++ b/pkgs/by-name/si/simple64/add-official-server-error-message.patch @@ -0,0 +1,15 @@ +diff --git a/simple64-gui/netplay/joinroom.cpp b/simple64-gui/netplay/joinroom.cpp +index 3b5c34e..68b46f2 100644 +--- a/simple64-gui/netplay/joinroom.cpp ++++ b/simple64-gui/netplay/joinroom.cpp +@@ -308,7 +308,9 @@ void JoinRoom::processTextMessage(QString message) + } + else + { +- msgBox.setText(json.value("message").toString()); ++ QString msg = json.value("message").toString(); ++ if(msg == "Bad authentication code") msg += "
Note: using the official netplay servers is not allowed on unofficial builds.
You can host your own server with `simple64-netplay-server`"; ++ msgBox.setText(msg); + msgBox.exec(); + } + } diff --git a/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch new file mode 100644 index 0000000000000..69d595cc428a4 --- /dev/null +++ b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch @@ -0,0 +1,37 @@ +diff --git a/build.sh b/build.sh +index 254a90d..e2d26cf 100644 +--- a/build.sh ++++ b/build.sh +@@ -77,7 +77,7 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE="${RELEASE_TYPE}" .. + cmake --build . + cp simple64-video-parallel.* "${install_dir}" + +-if [[ ! -d "${base_dir}/discord" ]]; then ++if false; then + echo "Downloading Discord SDK" + mkdir -p "${base_dir}/discord" + cd "${base_dir}/discord" +@@ -86,7 +86,7 @@ if [[ ! -d "${base_dir}/discord" ]]; then + rm discord_game_sdk.zip + fi + +-if [[ ! -d "${base_dir}/vosk" ]]; then ++if false; then + mkdir -p "${base_dir}/vosk" + cd "${base_dir}/vosk" + if [[ ${UNAME} == *"MINGW64"* ]]; then +@@ -156,14 +156,6 @@ if [[ ${UNAME} == *"MINGW64"* ]]; then + cp -v "${base_dir}/7z/x64/7za.exe" "${install_dir}" + cp -v "${base_dir}/discord/lib/x86_64/discord_game_sdk.dll" "${install_dir}" + cp -v "${base_dir}/vosk/libvosk.dll" "${install_dir}/vosk.dll" +-else +- cp "${base_dir}/vosk/libvosk.so" "${install_dir}" +- if [[ "${PLATFORM}" == "aarch64" ]]; then +- my_os=linux_aarch64 +- else +- my_os=linux_x86_64 +- cp "${base_dir}/discord/lib/x86_64/discord_game_sdk.so" "${install_dir}/libdiscord_game_sdk.so" +- fi + fi + + if [[ "$1" == "zip" ]]; then diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix new file mode 100644 index 0000000000000..b55c75414161a --- /dev/null +++ b/pkgs/by-name/si/simple64/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + writeShellScriptBin, + cmake, + ninja, + pkg-config, + makeWrapper, + zlib, + libpng, + SDL2, + SDL2_net, + hidapi, + qt6, + vulkan-loader, +}: + +let + cheats-json = fetchurl { + url = "https://raw.githubusercontent.com/simple64/cheat-parser/87963b7aca06e0d4632b66bc5ffe7d6b34060f4f/cheats.json"; + hash = "sha256-rS/4Mdi+18C2ywtM5nW2XaJkC1YnKZPc4YdQ3mCfESU="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "simple64"; + version = "2024.09.1"; + + src = fetchFromGitHub { + owner = "simple64"; + repo = "simple64"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-t3V7mvHlCP8cOvizR3N9DiCofnSvSHI6U0iXXkaMb34="; + }; + + patches = [ + ./dont-use-vosk-and-discord.patch + ./add-official-server-error-message.patch + ]; + + postPatch = '' + cp ${cheats-json} cheats.json + ''; + + stictDeps = true; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + cmake + ninja + pkg-config + makeWrapper + # fake git command for version info generator + (writeShellScriptBin "git" "echo ${finalAttrs.src.rev}") + ]; + + buildInputs = [ + zlib + libpng + SDL2 + SDL2_net + hidapi + qt6.qtbase + qt6.qtwebsockets + ]; + + dontUseCmakeConfigure = true; + + dontWrapQtApps = true; + + buildPhase = '' + runHook preInstall + + sh build.sh + + runHook postInstall + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/simple64 $out/bin + cp -r simple64/* $out/share/simple64 + + makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \ + "''${qtWrapperArgs[@]}" + + runHook postInstall + ''; + + meta = { + description = "Easy to use N64 emulator"; + homepage = "https://simple64.github.io"; + license = lib.licenses.gpl3Only; + mainProgram = "simple64-gui"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) From 80aa9b2146c128cd8e3c4fc975f1c19cd53e131c Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:30:05 +0200 Subject: [PATCH 05/97] simple64-netplay-server: init at 2024.06.1 --- .../si/simple64-netplay-server/package.nix | 27 +++++++++++++++++++ pkgs/by-name/si/simple64/package.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/by-name/si/simple64-netplay-server/package.nix diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix new file mode 100644 index 0000000000000..9f39a3b782d30 --- /dev/null +++ b/pkgs/by-name/si/simple64-netplay-server/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "simple64-netplay-server"; + version = "2024.06.1"; + + src = fetchFromGitHub { + owner = "simple64"; + repo = "simple64-netplay-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-WTEtTzRkXuIusfK6Nbj1aLwXcXyaXQi+j3SsDrvtLKo="; + }; + + vendorHash = "sha256-zfLSti368rBHj17HKDZKtOQQrhVGVa2CaieaDGHcZOk="; + + meta = { + description = "Dedicated server for simple64 netplay"; + homepage = "https://github.com/simple64/simple64-netplay-server"; + license = lib.licenses.gpl3Only; + mainProgram = "simple64-netplay-server"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix index b55c75414161a..4c00f6b806ddd 100644 --- a/pkgs/by-name/si/simple64/package.nix +++ b/pkgs/by-name/si/simple64/package.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { hidapi qt6.qtbase qt6.qtwebsockets + qt6.qtwayland ]; dontUseCmakeConfigure = true; From 9f1bc42ec8c3ea566fd9ccdffaa653b4135ff091 Mon Sep 17 00:00:00 2001 From: d-brasher <175485311+d-brasher@users.noreply.github.com> Date: Mon, 22 Jul 2024 22:42:36 +0200 Subject: [PATCH 06/97] ugit: init at 5.8 Co-authored-by: Yohann Boniface --- pkgs/by-name/ug/ugit/package.nix | 77 ++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 pkgs/by-name/ug/ugit/package.nix diff --git a/pkgs/by-name/ug/ugit/package.nix b/pkgs/by-name/ug/ugit/package.nix new file mode 100644 index 0000000000000..067a70cbf8d9b --- /dev/null +++ b/pkgs/by-name/ug/ugit/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + git, + fzf, + bash, + ncurses, + curl, + nix-update-script, + testers, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ugit"; + version = "5.8"; + + src = fetchFromGitHub { + owner = "Bhupesh-V"; + repo = "ugit"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WnEyS2JKH6rrsYOeGEwughWq2LKrHPSjio3TOI0Xm4g="; + }; + + strictDeps = true; + doInstallCheck = true; + + buildInputs = [ + fzf + curl + bash + ncurses + ]; + + propagatedBuildInputs = [ git ]; + nativeInstallCheckInputs = [ ncurses ]; + + postPatch = '' + substituteInPlace ugit \ + --replace-fail "fzf " "${lib.getExe fzf} " \ + --replace-fail "curl" "${lib.getExe curl}" \ + --replace-fail "tput " "${ncurses}/bin/tput " + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 ugit $out/bin/ugit + ln -s $out/bin/ugit $out/bin/git-undo + install -Dm644 ugit.plugin.zsh $out/share/zsh/ugit/ugit.zsh + + runHook postInstall + ''; + + installCheckPhase = '' + runHook preInstallCheck + + PATH=$PATH:$out/bin ugit --help + + runHook postInstallCheck + ''; + + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Tool that helps undoing the last git command with grace"; + homepage = "https://github.com/Bhupesh-V/ugit"; + downloadPage = "https://github.com/Bhupesh-V/ugit/releases"; + license = lib.licenses.mit; + mainProgram = "ugit"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ d-brasher ]; + }; +}) From 3bb39550226629683f48b5e3d00c04195dcf4c83 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:16:08 -0400 Subject: [PATCH 07/97] xorg.fonttosfnt: 1.2.3 -> 1.2.4 Diff: https://gitlab.freedesktop.org/xorg/app/fonttosfnt/-/compare/fonttosfnt-1.2.3...fonttosfnt-1.2.4 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7987eae7b4c7a..37611180b8666 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -854,11 +854,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "fonttosfnt"; - version = "1.2.3"; + version = "1.2.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz"; - sha256 = "1bv1glfz4jqvkwx8hmv2vqilvxxl6jww3rvbzv6zbl6b83r96yma"; + url = "mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz"; + sha256 = "0wk3fs038sh2sl1sqayzfjvygmcdp903qa1pd3aankxrgzv3b5i4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8c190f6d9f594..e4aab97bf2707 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -9,7 +9,7 @@ mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz mirror://xorg/individual/app/appres-1.0.7.tar.xz mirror://xorg/individual/app/bitmap-1.1.1.tar.xz mirror://xorg/individual/app/editres-1.0.9.tar.xz -mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz +mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz mirror://xorg/individual/app/iceauth-1.0.10.tar.xz mirror://xorg/individual/app/ico-1.0.6.tar.xz mirror://xorg/individual/app/listres-1.0.6.tar.xz From e2a90034e4dc7eac76a9b8049acb57b2b6b95d16 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:20:59 -0400 Subject: [PATCH 08/97] xorg.xcmsdb: 1.0.6 -> 1.0.7 Diff: https://gitlab.freedesktop.org/xorg/app/xcmsdb/-/compare/xcmsdb-1.0.6...xcmsdb-1.0.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 37611180b8666..2098c3f9a9c50 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2418,11 +2418,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcmsdb"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz"; - sha256 = "0magrza0i5qwpf0zlpqjychp3bzxgdw3p5v616xl4nbxag2fwxrw"; + url = "mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz"; + sha256 = "0f5wddi707cjqm21hynckkqr12mpjqn3dq9fm5gb11w19270di2y"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e4aab97bf2707..abd8400a97831 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -26,7 +26,7 @@ mirror://xorg/individual/app/xauth-1.1.3.tar.xz mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz mirror://xorg/individual/app/xclock-1.1.1.tar.xz -mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz +mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz mirror://xorg/individual/app/xconsole-1.1.0.tar.xz mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz From 3e78b5176e64a56a93fdc31eecdb9dceafaa1fcf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:23:32 -0400 Subject: [PATCH 09/97] xorg.xkbprint: 1.0.6 -> 1.0.7 Diff: https://gitlab.freedesktop.org/xorg/app/xkbprint/-/compare/xkbprint-1.0.6...xkbprint-1.0.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2098c3f9a9c50..822a74f58354e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3858,11 +3858,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbprint"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz"; - sha256 = "1c57kb8d8cbf720n9bcjhhaqpk08lac0sk4l0jp8j0mryw299k4r"; + url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz"; + sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index abd8400a97831..fab120f16a8a3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -46,7 +46,7 @@ mirror://xorg/individual/app/xinit-1.4.2.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz -mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz +mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz mirror://xorg/individual/app/xkill-1.0.6.tar.xz mirror://xorg/individual/app/xload-1.2.0.tar.xz From 7bdc8a8cba7b97bfed68ce9a0fb4a44be429e586 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:25:03 -0400 Subject: [PATCH 10/97] xorg.xmag: 1.0.7 -> 1.0.8 Diff: https://gitlab.freedesktop.org/xorg/app/xmag/-/compare/xmag-1.0.7...xmag-1.0.8 --- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 822a74f58354e..0515197737939 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4016,18 +4016,18 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { + xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmag"; - version = "1.0.7"; + version = "1.0.8"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmag-1.0.7.tar.xz"; - sha256 = "0qblrqrhxml2asgbck53a1v7c4y7ap7jcyqjg500h1i7bb63d680"; + url = "mirror://xorg/individual/app/xmag-1.0.8.tar.xz"; + sha256 = "0clm0vm35lkcir5w3bkypax9j57vyzkl9l89qqxbanvr7mc3qv9j"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; - buildInputs = [ libX11 libXaw libXmu libXt ]; + buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index fab120f16a8a3..d2569739cfcad 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -53,7 +53,7 @@ mirror://xorg/individual/app/xload-1.2.0.tar.xz mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz -mirror://xorg/individual/app/xmag-1.0.7.tar.xz +mirror://xorg/individual/app/xmag-1.0.8.tar.xz mirror://xorg/individual/app/xmessage-1.0.7.tar.xz mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz mirror://xorg/individual/app/xmore-1.0.4.tar.xz From 24bf2d3abd70e3c0bfd969427f93d8eca8246b98 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:26:18 -0400 Subject: [PATCH 11/97] xorg.xwud: 1.0.6 -> 1.0.7 Diff: https://gitlab.freedesktop.org/xorg/app/xwud/-/compare/xwud-1.0.6...xwud-1.0.7 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0515197737939..9be72cdfab8f6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4478,11 +4478,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xwud"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xwud-1.0.6.tar.xz"; - sha256 = "1zhsih1l3x1038fi1wi9npvfnn8j7580ca73saixjg5sbv8qq134"; + url = "mirror://xorg/individual/app/xwud-1.0.7.tar.xz"; + sha256 = "07n6q1z33sjkx8lx8lbd26m8ri5gi145k3mz39kmyykdngdbwp75"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d2569739cfcad..eca0f9d0b8851 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -70,7 +70,7 @@ mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz mirror://xorg/individual/app/xwd-1.0.9.tar.xz mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz -mirror://xorg/individual/app/xwud-1.0.6.tar.xz +mirror://xorg/individual/app/xwud-1.0.7.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz From 27cb8fcb92ad706b808ce8d26f8f5401e7813755 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:28:20 -0400 Subject: [PATCH 12/97] xorg.xf86inputevdev: 2.10.6 -> 2.11.0 Diff: https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/compare/xf86-input-evdev-2.10.6...xf86-input-evdev-2.11.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9be72cdfab8f6..80737452a3206 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2618,11 +2618,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-evdev"; - version = "2.10.6"; + version = "2.11.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; - sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz"; + sha256 = "058k0xdf4hkn8lz5gx4c08mgbzvv58haz7a32axndhscjgg2403k"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index eca0f9d0b8851..7292c727c0aee 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -76,7 +76,7 @@ mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz -mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz From f72f6d9aa39fbcc7954ea6cb03e25f70a524da31 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:29:45 -0400 Subject: [PATCH 13/97] xorg.xf86inputlibinput: 1.4.0 -> 1.5.0 Diff: https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/compare/xf86-input-libinput-1.4.0...xf86-input-libinput-1.5.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 80737452a3206..ac869d3f52842 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2678,11 +2678,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-input-libinput"; - version = "1.4.0"; + version = "1.5.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz"; - sha256 = "1673ydfrvfqd4inz3vx1qyxa0mhr0f4bi0r7mrcmpisxi76i8g9s"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz"; + sha256 = "1rl06l0gdqmc4v08mya93m74ana76b7s3fzkmq8ylm3535gw6915"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 7292c727c0aee..013534057fa54 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -79,7 +79,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz -mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz +mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz From 225baa68dae54271c32f65cae1d6ceac5f0ed600 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:30:54 -0400 Subject: [PATCH 14/97] xorg.xf86videomga: 2.0.1 -> 2.1.0 Diff: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/compare/xf86-video-mga-2.0.1...xf86-video-mga-2.1.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ac869d3f52842..8edc3bb8c22ac 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3078,11 +3078,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-mga"; - version = "2.0.1"; + version = "2.1.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz"; - sha256 = "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7"; + url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz"; + sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 013534057fa54..67fbb90403b3a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -99,7 +99,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz +mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2 https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2 From 3848778b3c71fb9eda09fc69805f4f44748dc2a1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:33:48 -0400 Subject: [PATCH 15/97] xorg.xf86videor128: 6.12.1 -> 6.13.0 Diff: https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128/-/compare/xf86-video-r128-6.12.1...xf86-video-r128-6.13.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8edc3bb8c22ac..ca3f699b8d67b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3238,11 +3238,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-r128"; - version = "6.12.1"; + version = "6.13.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz"; - sha256 = "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx"; + url = "mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz"; + sha256 = "0igpfgls5nx4sz8a7yppr42qi37prqmxsy08zqbxbv81q9dfs2zj"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 67fbb90403b3a..6dda1223eb052 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -107,7 +107,7 @@ mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz -mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz +mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz From 2e85991f1ebf49ba27e1c874b273d92d77491864 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 19 Oct 2024 22:37:53 -0400 Subject: [PATCH 16/97] xorg.bdftopcf: 1.1.1 -> 1.1.2 Diff: https://gitlab.freedesktop.org/xorg/util/bdftopcf/-/compare/bdftopcf-1.1.1...bdftopcf-1.1.2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ca3f699b8d67b..9f8dde4bddc14 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,11 +28,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "bdftopcf"; - version = "1.1.1"; + version = "1.1.2"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz"; - sha256 = "026rzs92h9jsc7r0kvvyvwhm22q0805gp38rs14x6ghg7kam7j8i"; + url = "mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz"; + sha256 = "0fjjn1z0cbsmhxkms93w73j2jbzf9f3xgbnjvnisl3rk0icvwq5w"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6dda1223eb052..139e2456d8347 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -211,7 +211,7 @@ mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.5.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz -mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz +mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz mirror://xorg/individual/util/gccmakedep-1.0.4.tar.xz mirror://xorg/individual/util/imake-1.0.10.tar.xz mirror://xorg/individual/util/lndir-1.0.5.tar.xz From 6c315c2ec03e55a7f98cc72ea4f277db3f3a782f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 23 Oct 2024 14:45:07 +0200 Subject: [PATCH 17/97] vdo: 8.3.0.71 -> 8.3.0.72 --- pkgs/os-specific/linux/vdo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index dc0a30732ed02..6f9b76ebc5477 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.3.0.71"; + version = "8.3.0.72"; src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - hash = "sha256-FZerMUzth43p5jvKQalyYcW+mrl6SLjS8GrivY2qWkI="; + hash = "sha256-ILS5cUWR04/GePyXHj00Am4HMDAhAaN/uUe7kchjo/8="; }; nativeBuildInputs = [ From bec88bb003235fd81eec490ed2126ddde6fdc6b8 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 23 Oct 2024 22:47:42 -0400 Subject: [PATCH 18/97] python312Packages.openslide: init at 1.3.1 --- .../python-modules/openslide/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/openslide/default.nix diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix new file mode 100644 index 0000000000000..9878366a72509 --- /dev/null +++ b/pkgs/development/python-modules/openslide/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + openslide, + pillow, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "openslide"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "openslide"; + repo = "openslide-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo="; + }; + + postPatch = '' + substituteInPlace openslide/lowlevel.py \ + --replace-fail "return cdll.LoadLibrary(name)" "return cdll.LoadLibrary(f'${lib.getLib openslide}/lib/{name}')" + ''; + + build-system = [ setuptools ]; + + dependencies = [ pillow ]; + + pythonImportsCheck = [ "openslide" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = ''rm -rf openslide/''; + + meta = { + description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images"; + homepage = "https://github.com/openslide/openslide-python"; + changelog = "https://github.com/openslide/openslide-python/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf85502d987ae..db3459457af08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9379,6 +9379,8 @@ self: super: with self; { opensimplex = callPackage ../development/python-modules/opensimplex { }; + openslide = callPackage ../development/python-modules/openslide { inherit (pkgs) openslide; }; + openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { }; openstacksdk = callPackage ../development/python-modules/openstacksdk { }; From 28146448cb4764b2434088b3baf409b6988d072e Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 16:19:11 +0200 Subject: [PATCH 19/97] grpc: add comment about updating related python packages The version of related python packages should always stay in sync with the grpc package version, as they can be incompatible otherwise. --- pkgs/development/libraries/grpc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 948048895700c..5d1ab0bed4ed5 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -22,8 +22,13 @@ stdenv.mkDerivation rec { pname = "grpc"; version = "1.66.1"; # N.B: if you change this, please update: - # pythonPackages.grpcio-tools + # pythonPackages.grpcio + # pythonPackages.grpcio-channelz + # pythonPackages.grpcio-health-checking + # pythonPackages.grpcio-reflection # pythonPackages.grpcio-status + # pythonPackages.grpcio-testing + # pythonPackages.grpcio-tools src = fetchFromGitHub { owner = "grpc"; From 680149f564d9882c2a9d4428d61b286cc01cd492 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:48:06 +0200 Subject: [PATCH 20/97] pythonPackages.grpcio: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 5dc26d50be2b5..2502643370e6f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -16,6 +16,9 @@ zlib, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; format = "setuptools"; From 0960ebf466cba2e70a4b8cc8c5be2be593c2091e Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:51:39 +0200 Subject: [PATCH 21/97] pythonPackages.grpcio-channelz: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio-channelz/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 4d5662509e069..75c3ade1b51dc 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -7,6 +7,9 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; version = "1.66.2"; From 4dc4df62cc6f09595c5e4eadf8a79975dc6b7888 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:52:24 +0200 Subject: [PATCH 22/97] pythonPackages.grpcio-healthz-checking: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- .../python-modules/grpcio-health-checking/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index e7b6f49f158be..c96b71d3f5fce 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -6,6 +6,9 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; version = "1.66.2"; From fbdd33747bb2c8da3cc22959b73affe27d0bc9a1 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:52:56 +0200 Subject: [PATCH 23/97] pythonPackages.grpcio-reflection: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio-reflection/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 35fb1faaeaefa..c37492ccf4769 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -7,6 +7,9 @@ protobuf, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; version = "1.66.2"; From ccfbf42fd5437decc047a4eae9e4231920208b2f Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:53:39 +0200 Subject: [PATCH 24/97] pythonPackages.grpcio-status: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio-status/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index e72822cbd68d8..065f4f833ecca 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -8,6 +8,9 @@ pythonOlder, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; version = "1.66.1"; From 50225d85a9a6da7e4f08ba275f2fee1d3521782d Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:53:55 +0200 Subject: [PATCH 25/97] pythonPackages.grpcio-testing: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio-testing/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cabad7a8cfbe7..0d38efffbc142 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -8,6 +8,9 @@ setuptools, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; version = "1.66.2"; From 651a7125944e072ee8a5faaf7d4dabe5e7cd0971 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 18:54:20 +0200 Subject: [PATCH 26/97] pythonPackages.grpcio-tools: disable auto update by nixpkgs-update This package should always be updated together with the grpc package to ensure compatibility. --- pkgs/development/python-modules/grpcio-tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index a61999ef5b78f..f5c477eb3a873 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -7,6 +7,9 @@ setuptools, }: +# This package should be updated together with the main grpc package and other +# related python grpc packages. +# nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; version = "1.66.1"; From 0d7cb827a42431f944a6b83d303a5af834d877c4 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 16 Oct 2024 19:13:30 +0200 Subject: [PATCH 27/97] grpc: disable auto updates by nixpkgs-update The grpc package should be updated together to with all related python packages to ensure compatibility. --- pkgs/development/libraries/grpc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 5d1ab0bed4ed5..1dd516ec99cfd 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -19,6 +19,9 @@ , arrow-cpp }: +# This package should be updated together with all related python grpc packages +# to ensure compatibility. +# nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; version = "1.66.1"; # N.B: if you change this, please update: From 608f85717f201bbf217d876e3a27701cd1bf0b4e Mon Sep 17 00:00:00 2001 From: name_snrl Date: Sat, 26 Oct 2024 07:05:03 +0500 Subject: [PATCH 28/97] nixos-install: add prefix `extra-` to flake flags --- pkgs/by-name/ni/nixos-install/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh index 6098aac7d3785..b428406f95a2f 100755 --- a/pkgs/by-name/ni/nixos-install/nixos-install.sh +++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh @@ -41,7 +41,7 @@ while [ "$#" -gt 0 ]; do ;; --flake) flake="$1" - flakeFlags=(--experimental-features 'nix-command flakes') + flakeFlags=(--extra-experimental-features 'nix-command flakes') shift 1 ;; --file|-f) From 8f369ce873ea62a1bb75364f119881e03728e462 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 27 Oct 2024 08:12:07 -0400 Subject: [PATCH 29/97] pythonPackages.einx: init at 0.3.0 --- .../python-modules/einx/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/einx/default.nix diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix new file mode 100644 index 0000000000000..0f181b5051aa0 --- /dev/null +++ b/pkgs/development/python-modules/einx/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + numpy, + sympy, + frozendict, +}: + +buildPythonPackage rec { + pname = "einx"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fferflo"; + repo = "einx"; + rev = "v${version}"; + hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8="; + }; + + build-system = [ + setuptools + wheel + ]; + + dependencies = [ + numpy + sympy + frozendict + ]; + + pythonImportsCheck = [ + "einx" + ]; + + meta = { + description = "Universal Tensor Operations in Einstein-Inspired Notation for Python"; + homepage = "https://github.com/fferflo/einx"; + changelog = "https://github.com/fferflo/einx/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6bb02157d3b4..f73aae060efec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3957,6 +3957,8 @@ self: super: with self; { einops = callPackage ../development/python-modules/einops { }; + einx = callPackage ../development/python-modules/einx { }; + eiswarnung = callPackage ../development/python-modules/eiswarnung { }; elgato = callPackage ../development/python-modules/elgato { }; From 5153b7b1a3f83ff175df9be1ab5b17754519ac67 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 27 Oct 2024 21:59:53 +0100 Subject: [PATCH 30/97] sway-unwrapped: 1.9 -> 1.10 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sw/sway-unwrapped/package.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 6bcff1c52a2d2..05a182ac80633 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; - version = "1.9"; + version = "1.10"; inherit enableXWayland isNixOS systemdSupport trayEnabled; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = finalAttrs.version; - hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg="; + hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk="; }; patches = [ @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in [ (mesonOption "sd-bus-provider" sd-bus-provider) - (mesonEnable "xwayland" finalAttrs.enableXWayland) (mesonEnable "tray" finalAttrs.trayEnabled) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c39a5cd60f63..b4c7c9ad57c32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4410,7 +4410,7 @@ with pkgs; shotman = callPackage ../tools/wayland/shotman { }; sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { - wlroots = wlroots_0_17; + wlroots = wlroots_0_18; }; swayr = callPackage ../tools/wayland/swayr { }; From 7664e3024cb29feaad3c7e35fd5130eb8085b111 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:32:43 +0100 Subject: [PATCH 31/97] python3Packages.django-storages: Fix tests --- .../python-modules/django-storages/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 1014efc09e65d..7057888458456 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -15,6 +15,7 @@ pythonOlder, rsa, setuptools, + fetchpatch, }: buildPythonPackage rec { @@ -31,6 +32,16 @@ buildPythonPackage rec { hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI="; }; + patches = [ + # Add Moto 5 support + # https://github.com/jschneier/django-storages/pull/1464 + (fetchpatch { + url = "https://github.com/jschneier/django-storages/commit/e1aedcf2d137f164101d31f2f430f1594eedd78c.patch"; + hash = "sha256-jSb/uJ0RXvPsXl+WUAzAgDvJl9Y3ad2F30X1SbsCc04="; + name = "add_moto_5_support.patch"; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ django ]; @@ -58,14 +69,10 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'str' object has no attribute 'universe_domain' + # https://github.com/jschneier/django-storages/issues/1463 "test_storage_save_gzip" ]; - disabledTestPaths = [ - # ImportError: cannot import name 'mock_s3' from 'moto' - "tests/test_s3.py" - ]; - meta = with lib; { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; From a7c4257694acda84e8f85e33f0daaf1fb6f904cb Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:38:50 +0100 Subject: [PATCH 32/97] python3Packages.django-storages: Add missing test dependency --- pkgs/development/python-modules/django-storages/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 7057888458456..28111a2db07b4 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -15,6 +15,7 @@ pythonOlder, rsa, setuptools, + pynacl, fetchpatch, }: @@ -63,6 +64,8 @@ buildPythonPackage rec { rsa ] ++ lib.flatten (builtins.attrValues optional-dependencies); + checkInputs = [ pynacl ]; + pythonImportsCheck = [ "storages" ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; From 05daae7142d373b6f4a0a54acdd79d884817940b Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 28 Oct 2024 09:41:49 +0100 Subject: [PATCH 33/97] python3Packages.django-storages: Stylistic updates --- .../python-modules/django-storages/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 28111a2db07b4..161012236047f 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -43,9 +43,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; optional-dependencies = { azure = [ azure-storage-blob ]; @@ -76,12 +76,12 @@ buildPythonPackage rec { "test_storage_save_gzip" ]; - meta = with lib; { + meta = { description = "Collection of custom storage backends for Django"; changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; - license = licenses.bsd3; - maintainers = with maintainers; [ mmai ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mmai ]; }; } From 0995809cca85577b05328a65c84c59c4a266830f Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 23 Oct 2024 13:34:30 +0200 Subject: [PATCH 34/97] python3Packages.django-mfa3: init at 0.13.0 --- .../python-modules/django-mfa3/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/django-mfa3/default.nix diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix new file mode 100644 index 0000000000000..c0ed1e4f287bb --- /dev/null +++ b/pkgs/development/python-modules/django-mfa3/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + setuptools, + pyotp, + fido2, + qrcode, + python, +}: + +buildPythonPackage rec { + pname = "django-mfa3"; + version = "0.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xi"; + repo = "django-mfa3"; + rev = "refs/tags/${version}"; + hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + pyotp + fido2 + qrcode + ]; + + # qrcode 8.0 not supported yet + # See https://github.com/xi/django-mfa3/pull/14 + pythonRelaxDeps = [ "qrcode" ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = { + description = "Multi factor authentication for Django"; + homepage = "https://github.com/xi/django-mfa3"; + changelog = "https://github.com/xi/django-mfa3/blob/${src.rev}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 051fead9ec4d6..d86f8de75cb91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3444,6 +3444,8 @@ self: super: with self; { django-markdownx = callPackage ../development/python-modules/django-markdownx { }; + django-mfa3 = callPackage ../development/python-modules/django-mfa3 { }; + django-model-utils = callPackage ../development/python-modules/django-model-utils { }; django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; From eb382ecd5226570a283e8cacc0066c09a276f65e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 28 Oct 2024 08:40:21 +0100 Subject: [PATCH 35/97] nixos/sway: update default extraPackages Signed-off-by: Sefa Eyeoglu --- nixos/modules/programs/wayland/sway.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 1fae6b120074e..74fc216569e56 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -85,9 +85,10 @@ in extraPackages = lib.mkOption { type = with lib.types; listOf package; - default = with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + # Packages used in default config + default = with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; defaultText = lib.literalExpression '' - with pkgs; [ swaylock swayidle foot dmenu wmenu ]; + with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ]; ''; example = lib.literalExpression '' with pkgs; [ i3status i3status-rust termite rofi light ] From ee83760a335382ca9b81aac8ecf399d8e93a2d63 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Tue, 29 Oct 2024 02:08:14 +0800 Subject: [PATCH 36/97] mmdbinspect: init at 0.2.0 --- pkgs/by-name/mm/mmdbinspect/package.nix | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/mm/mmdbinspect/package.nix diff --git a/pkgs/by-name/mm/mmdbinspect/package.nix b/pkgs/by-name/mm/mmdbinspect/package.nix new file mode 100644 index 0000000000000..ca0c32ad758dd --- /dev/null +++ b/pkgs/by-name/mm/mmdbinspect/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "mmdbinspect"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "maxmind"; + repo = "mmdbinspect"; + rev = "refs/tags/v${version}"; + hash = "sha256-PYn+NgJDZBP+9nIU0kxg9KYT0EV35omagspcsCpa9DM="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-HNgofsfMsqXttnrNDIPgLHag+2hqQTREomcesWldpMo="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Look up records for one or more IPs/networks in one or more .mmdb databases"; + homepage = "https://github.com/maxmind/mmdbinspect"; + changelog = "https://github.com/maxmind/mmdbinspect/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "mmdbinspect"; + }; +} From 3d69d435ba19175a76d733c96ad09a2f93483e95 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 29 Oct 2024 10:23:30 +0100 Subject: [PATCH 37/97] botan3: 3.5.0 -> 3.6.1 Notable changes: * increased EC performance * better CPU feature detection * more work on PQ algorithm support Full changelog: https://botan.randombit.net/news.html#version-3-6-1-2024-10-26 Signed-off-by: Markus Theil --- pkgs/development/libraries/botan/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 976144b1b5ca8..8d11ee2b79371 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -6,6 +6,7 @@ docutils, bzip2, zlib, + jitterentropy, darwin, static ? stdenv.hostPlatform.isStatic, # generates static libraries *only* }: @@ -56,7 +57,10 @@ let CoreServices Security ] - ); + ) + ++ lib.optionals (lib.versionAtLeast version "3.6.0") [ + jitterentropy + ]; buildTargets = [ "cli" ] @@ -81,6 +85,9 @@ let ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--cpu=aarch64" + ] + ++ lib.optionals (lib.versionAtLeast version "3.6.0") [ + "--enable-modules=jitter_rng" ]; configurePhase = '' @@ -117,8 +124,8 @@ let in { botan3 = common { - version = "3.5.0"; - hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + version = "3.6.1"; + hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk="; # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; }; From 5b78ac752259a38640c9d94dff9a325fda2565b9 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 29 Oct 2024 10:12:23 +0100 Subject: [PATCH 38/97] kitsas: 4.0.5 -> 5.7 --- pkgs/applications/office/kitsas/default.nix | 53 +++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index 9821cdd2f2f86..8c2def9fda0ef 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -1,24 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + qt6, + poppler, + libzip, + pkg-config, +}: stdenv.mkDerivation rec { pname = "kitsas"; - version = "4.0.5"; + version = "5.7"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg="; + hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k="; }; - postPatch = '' - substituteInPlace kitsas/kitsas.pro \ - --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5" - ''; - - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; - buildInputs = [ qtsvg poppler libzip ]; + buildInputs = [ + libzip + poppler + qt6.qt5compat + qt6.qtsvg + qt6.qtwebengine + ]; # We use a separate build-dir as otherwise ld seems to get confused between # directory and executable name on buildPhase. @@ -28,15 +41,17 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - install -Dm755 kitsas -t $out/bin - install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps - install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps - install -Dm644 ../kitsas.desktop -t $out/share/applications - ''; + installPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv kitsas.app $out/Applications + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm755 kitsas -t $out/bin + install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps + install -Dm644 ../kitsas.desktop -t $out/share/applications + ''; meta = with lib; { homepage = "https://github.com/artoh/kitupiikki"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93f3939af9575..bcd0ba6a1d34e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30233,7 +30233,7 @@ with pkgs; kile = callPackage ../applications/editors/kile { }; - kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; + kitsas = callPackage ../applications/office/kitsas { }; kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; From 74b36317c02d4a2fded94cc23017de19fb4bb2ad Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 29 Oct 2024 10:14:48 +0100 Subject: [PATCH 39/97] kitsas: move to by-name --- .../office/kitsas/default.nix => by-name/ki/kitsas/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/office/kitsas/default.nix => by-name/ki/kitsas/package.nix} (100%) diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/by-name/ki/kitsas/package.nix similarity index 100% rename from pkgs/applications/office/kitsas/default.nix rename to pkgs/by-name/ki/kitsas/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcd0ba6a1d34e..52aca76805b0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30233,8 +30233,6 @@ with pkgs; kile = callPackage ../applications/editors/kile { }; - kitsas = callPackage ../applications/office/kitsas { }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; From 8ad33345994535aa335d6c3ca15805bc70883f2a Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 29 Oct 2024 10:21:22 +0100 Subject: [PATCH 40/97] kitsas: add qtwayland build input for linux --- pkgs/by-name/ki/kitsas/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 8c2def9fda0ef..854c53cc53273 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -25,13 +25,17 @@ stdenv.mkDerivation rec { qt6.wrapQtAppsHook ]; - buildInputs = [ - libzip - poppler - qt6.qt5compat - qt6.qtsvg - qt6.qtwebengine - ]; + buildInputs = + [ + libzip + poppler + qt6.qt5compat + qt6.qtsvg + qt6.qtwebengine + ] + ++ lib.optional stdenv.hostPlatform.isLinux [ + qt6.qtwayland + ]; # We use a separate build-dir as otherwise ld seems to get confused between # directory and executable name on buildPhase. From c19173b97d7a0ee22bf59f39c3453a599dc48e8f Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:29:57 +0300 Subject: [PATCH 41/97] telegram-bot-api: 7.3 -> 7.10 --- pkgs/servers/telegram-bot-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix index 3481b853715d0..dce7eea0ccd63 100644 --- a/pkgs/servers/telegram-bot-api/default.nix +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "telegram-bot-api"; - version = "7.3"; + version = "7.10"; src = fetchFromGitHub { repo = "telegram-bot-api"; owner = "tdlib"; - rev = "5951bfbab8b1274437c613c1c48d91be2a050371"; - hash = "sha256-5aNZqP4K+zP7q1+yllr6fysEcewhh/V9Vl6GXQolanI="; + rev = "a186a9ae823d91678ace87ef5b920688c555f5b5"; + hash = "sha256-1oGDR9WLWC/0QyAmTkMWkbkD+49/gU/nWBZq0mMOl8g="; fetchSubmodules = true; }; From 2e74199368188f308c134c0a9e1da89ee521d488 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:33:03 +0300 Subject: [PATCH 42/97] telegram-bot-api: move to pkgs/by-name --- .../default.nix => by-name/te/telegram-bot-api/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/telegram-bot-api/default.nix => by-name/te/telegram-bot-api/package.nix} (100%) diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/by-name/te/telegram-bot-api/package.nix similarity index 100% rename from pkgs/servers/telegram-bot-api/default.nix rename to pkgs/by-name/te/telegram-bot-api/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78432a806ea6c..e13f4de011a72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32592,8 +32592,6 @@ with pkgs; else stdenv; }; - telegram-bot-api = callPackage ../servers/telegram-bot-api { }; - tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { }; From bc50b936690caaac727f611adf7f429cdf8a0cbe Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 15:35:57 +0300 Subject: [PATCH 43/97] telegram-bot-api: refactor meta, format using nixfmt-rfc-style --- pkgs/by-name/te/telegram-bot-api/package.nix | 31 +++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index dce7eea0ccd63..97e96a1999114 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gperf, openssl, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gperf, + openssl, + zlib, +}: stdenv.mkDerivation { pname = "telegram-bot-api"; @@ -12,15 +20,24 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake gperf ]; - buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ + cmake + gperf + ]; + buildInputs = [ + openssl + zlib + ]; - meta = with lib; { + meta = { description = "Telegram Bot API server"; homepage = "https://github.com/tdlib/telegram-bot-api"; - license = licenses.boost; - maintainers = with maintainers; [ Anillc Forden ]; - platforms = platforms.all; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ + Anillc + Forden + ]; + platforms = lib.platforms.all; mainProgram = "telegram-bot-api"; }; } From 1477a974e29e43ce424112ddff780b29122b8fcb Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:25:20 +0800 Subject: [PATCH 44/97] gui-for-clash: init at 1.8.9 --- pkgs/by-name/gu/gui-for-clash/package.nix | 140 ++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 pkgs/by-name/gu/gui-for-clash/package.nix diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix new file mode 100644 index 0000000000000..b4c5263a5d6db --- /dev/null +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -0,0 +1,140 @@ +{ + stdenv, + nodejs, + pnpm, + fetchFromGitHub, + buildGoModule, + lib, + wails, + webkitgtk_4_0, + pkg-config, + libsoup_3, + wrapGAppsHook3, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, +}: +let + pname = "gui-for-clash"; + version = "1.8.9"; + src = fetchFromGitHub { + owner = "GUI-for-Cores"; + repo = "GUI.for.Clash"; + rev = "v${version}"; + hash = "sha256-jNYMv3gPbZV2JlTV0v0NQ06HkXDzgHXuEdJrBgQ+p2g="; + }; + frontend = stdenv.mkDerivation (finalAttrs: { + inherit pname version src; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-RQtU61H1YklCgJrlyHALxUZp8OvVs2MgFThWBsYk2cs="; + }; + + sourceRoot = "${finalAttrs.src.name}/frontend"; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out/ + cp -r ./dist/* $out/ + + runHook postInstall + ''; + + meta = { + description = "GUI program developed by vue3"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; + }); +in +buildGoModule { + inherit pname version src; + + vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg="; + + nativeBuildInputs = [ + wails + pkg-config + wrapGAppsHook3 + autoPatchelfHook + copyDesktopItems + ]; + + buildInputs = [ + webkitgtk_4_0 + libsoup_3 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "GUI.for.Clash"; + exec = "GUI.for.Clash"; + icon = "GUI.for.Clash"; + genericName = "GUI.for.Clash"; + desktopName = "GUI.for.Clash"; + categories = [ + "Network" + ]; + keywords = [ + "Proxy" + ]; + }) + ]; + + postUnpack = '' + cp -r ${frontend} $sourceRoot/frontend/dist + ''; + + postPatch = '' + sed -i '/exePath, err := os.Executable()/,+3d' bridge/bridge.go + substituteInPlace bridge/bridge.go \ + --replace-fail "Env.BasePath = filepath.Dir(exePath)" "" \ + --replace-fail "Env.AppName = filepath.Base(exePath)" "Env.AppName = \"GUI.for.Clash\" + Env.BasePath = filepath.Join(os.Getenv(\"HOME\"), \".config\", Env.AppName)" \ + --replace-fail 'exePath := Env.BasePath' 'exePath := "${placeholder "out"}/bin"' + ''; + + buildPhase = '' + runHook preBuild + + wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.Clash + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/pixmaps + cp -r ./build/bin $out/bin + cp build/appicon.png $out/share/pixmaps/GUI.for.Clash.png + + runHook postInstall + ''; + + meta = { + description = "Clash GUI program developed by vue3 + wails"; + homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash"; + mainProgram = "GUI.for.Clash"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} From abb64f76000b0aadf06356212dc8d5a44651a6e2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 29 Oct 2024 14:01:28 +0100 Subject: [PATCH 45/97] redmine: Update vulnerable gems where possible Update gems in order to fix vulnerable dependencies. The following CVEs are fixed: * CVE-2024-45614 * CVE-2024-39908 * CVE-2024-41123 * CVE-2024-41946 * CVE-2024-43398 * CVE-2024-49761 * CVE-2024-47220 The following CVEs remain since related gems have pinned versions in Redmine. * CVE-2024-34459 * CVE-2024-47888 * CVE-2024-47887 * CVE-2024-41128 * CVE-2024-47889 Signed-off-by: Felix Singer --- pkgs/by-name/re/redmine/Gemfile.lock | 60 +++++++------ pkgs/by-name/re/redmine/gemset.nix | 123 ++++++++++++--------------- 2 files changed, 85 insertions(+), 98 deletions(-) diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index fe895ddd26e78..4eb035582d1cb 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -79,15 +79,15 @@ GEM xpath (~> 3.2) chunky_png (1.4.0) commonmarker (0.23.10) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) crass (1.0.6) - css_parser (1.17.1) + css_parser (1.19.1) addressable csv (3.2.9) date (3.3.4) deckar01-task_list (2.3.2) html-pipeline - docile (1.4.0) + docile (1.4.1) erubi (1.13.0) ffi (1.17.0) globalid (1.2.1) @@ -96,15 +96,15 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.2) + json (2.7.4) language_server-protocol (3.17.0.3) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) - loofah (2.22.0) + logger (1.6.1) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -118,8 +118,8 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.24.1) - mocha (2.4.0) + minitest (5.25.1) + mocha (2.5.0) ruby2_keywords (>= 0.0.5) mysql2 (0.5.6) net-imap (0.3.7) @@ -132,20 +132,20 @@ GEM timeout net-smtp (0.3.4) net-protocol - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.15.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - pg (1.5.6) - public_suffix (6.0.0) - puma (6.4.2) + pg (1.5.9) + public_suffix (6.0.1) + puma (6.4.3) nio4r (~> 2.0) - racc (1.8.0) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails (6.1.7.8) @@ -189,8 +189,7 @@ GEM regexp_parser (2.9.2) request_store (1.5.1) rack (>= 1.4) - rexml (3.3.1) - strscan + rexml (3.3.9) roadie (5.2.1) css_parser (~> 1.4) nokogiri (~> 1.15) @@ -214,7 +213,7 @@ GEM rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.3) parser (>= 3.3.1.0) rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) @@ -227,10 +226,10 @@ GEM ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.1.1) + sanitize (6.1.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - selenium-webdriver (4.22.0) + selenium-webdriver (4.25.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -240,24 +239,23 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.5.1) + sprockets-rails (3.5.2) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) - strscan (3.1.0) - thor (1.3.1) + thor (1.3.2) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + webrick (1.8.2) websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -267,8 +265,8 @@ GEM zeitwerk (>= 2.6) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.36) - zeitwerk (2.6.16) + yard (0.9.37) + zeitwerk (2.6.18) PLATFORMS ruby @@ -321,7 +319,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.1.5p252 + ruby 3.1.6p260 BUNDLED WITH 2.5.9 diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index 720e7d7fa7311..33d1cb3922000 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -208,10 +208,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; crass = { groups = ["default"]; @@ -229,10 +229,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb"; + sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r"; type = "gem"; }; - version = "1.17.1"; + version = "1.19.1"; }; csv = { groups = ["default"]; @@ -270,10 +270,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; + sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; erubi = { groups = ["default"]; @@ -343,20 +343,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.5"; + version = "1.14.6"; }; json = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.4"; }; language_server-protocol = { groups = ["default" "test"]; @@ -384,10 +384,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; + sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h"; type = "gem"; }; - version = "2.22.0"; + version = "2.23.1"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -484,10 +484,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.24.1"; + version = "5.25.1"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -495,10 +495,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzpqxmk8h9pr0m6knryjd0dgmmyg0bwrksp3rqhrdxpaa3ddr6s"; + sha256 = "05vp9kfz8d8wmclpkc9vj67ic1f7p1d5m2kd7xm4rvz8ci85jlkq"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; mysql2 = { groups = ["default"]; @@ -577,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -598,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j"; + sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; type = "gem"; }; - version = "1.25.1"; + version = "1.26.3"; }; parser = { dependencies = ["ast" "racc"]; @@ -609,10 +609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d"; + sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk"; type = "gem"; }; - version = "3.3.4.0"; + version = "3.3.5.0"; }; pg = { groups = ["default"]; @@ -627,20 +627,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; + sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; type = "gem"; }; - version = "1.5.6"; + version = "1.5.9"; }; public_suffix = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -648,30 +648,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; racc = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; rack = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.9"; + version = "2.2.10"; }; rack-test = { dependencies = ["rack"]; @@ -822,15 +822,14 @@ version = "1.5.1"; }; rexml = { - dependencies = ["strscan"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.9"; }; roadie = { dependencies = ["css_parser" "nokogiri"]; @@ -912,10 +911,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv"; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; type = "gem"; }; - version = "1.31.3"; + version = "1.32.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -975,10 +974,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qczw46f82f8nam87xdzk17frwfwwqq7km6ma0kwc0nadmi4glgq"; + sha256 = "0lj1jjxn1znxmaf6jnngfrz26rw85smxb69m4jl6a9yq6gwyab54"; type = "gem"; }; - version = "6.1.1"; + version = "6.1.3"; }; selenium-webdriver = { dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"]; @@ -986,10 +985,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjxlivsh32xvjq78p1m1sr366aa04wms4hwb2r187ygrnmp0hv4"; + sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; type = "gem"; }; - version = "4.22.0"; + version = "4.25.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -1007,10 +1006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; + sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; type = "gem"; }; - version = "0.12.3"; + version = "0.13.1"; }; simplecov_json_formatter = { groups = ["default" "test"]; @@ -1039,10 +1038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4"; + sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.2"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -1063,25 +1062,15 @@ }; version = "1.6.9"; }; - strscan = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; timeout = { groups = ["default"]; @@ -1109,20 +1098,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; websocket = { groups = ["default" "test"]; @@ -1182,19 +1171,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am"; + sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6"; type = "gem"; }; - version = "0.9.36"; + version = "0.9.37"; }; zeitwerk = { groups = ["common_mark" "default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; + sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx"; type = "gem"; }; - version = "2.6.16"; + version = "2.6.18"; }; } From 6e6270a45ac294ec238031b7e725014f36c9b82e Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 16:27:24 +0300 Subject: [PATCH 46/97] cargo-modules: 0.16.8 -> 0.19.1 --- .../tools/rust/cargo-modules/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index da236481f45d5..b99b506c61117 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,26 +2,31 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.16.8"; + version = "0.19.1"; src = fetchFromGitHub { owner = "regexident"; - repo = pname; - rev = "v${version}"; - hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k="; + repo = "cargo-modules"; + rev = "refs/tags/v${version}"; + hash = "sha256-2wA34rQHHAvx+5NhmtugnGTMZ2Sj8MNpdkkIJhDK1HM="; }; - cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs="; + cargoHash = "sha256-3R7rFkA2tObJZk5ypWPpMojEZvrDgKZsc1dN1wBJ63A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; checkFlags = [ - "--skip=cfg_test::smoke" + "--skip=cfg_test::with_tests::smoke" + "--skip=cfg_test::without_tests::smoke" "--skip=colors::ansi::smoke" "--skip=colors::plain::smoke" "--skip=colors::truecolor::smoke" + "--skip=fields::enum_fields" + "--skip=fields::struct_fields" + "--skip=fields::tuple_fields" + "--skip=fields::union_fields" "--skip=focus_on::glob_path::smoke" "--skip=focus_on::self_path::smoke" "--skip=focus_on::simple_path::smoke" @@ -34,10 +39,6 @@ rustPlatform.buildRustPackage rec { "--skip=selection::no_modules::smoke" "--skip=selection::no_traits::smoke" "--skip=selection::no_types::smoke" - "--skip=fields::enum_fields" - "--skip=fields::struct_fields" - "--skip=fields::tuple_fields" - "--skip=fields::union_fields" ]; meta = with lib; { From b03b98b1734fb6f3c8bc10f2048e18b4961a7dba Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 16:32:15 +0300 Subject: [PATCH 47/97] cargo-modules: move to pkgs/by-name --- .../default.nix => by-name/ca/cargo-modules/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/tools/rust/cargo-modules/default.nix => by-name/ca/cargo-modules/package.nix} (100%) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/by-name/ca/cargo-modules/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-modules/default.nix rename to pkgs/by-name/ca/cargo-modules/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78432a806ea6c..e98649a669c79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15579,7 +15579,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; From 5cee7bf55a8423a6c2c48fd23b70fdbb5ee47413 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 29 Oct 2024 16:35:32 +0300 Subject: [PATCH 48/97] cargo-modules: refactor meta, format using nixfmt-rfc-style --- pkgs/by-name/ca/cargo-modules/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index b99b506c61117..13625dae781db 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -1,4 +1,10 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, +}: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; @@ -41,12 +47,16 @@ rustPlatform.buildRustPackage rec { "--skip=selection::no_types::smoke" ]; - meta = with lib; { + meta = { description = "Cargo plugin for showing a tree-like overview of a crate's modules"; - mainProgram = "cargo-modules"; homepage = "https://github.com/regexident/cargo-modules"; changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda rvarago matthiasbeyer ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + figsoda + rvarago + matthiasbeyer + ]; + mainProgram = "cargo-modules"; }; } From 66a24bc77a688b1d172be01a01a390de3b978ee3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 15:40:31 +0000 Subject: [PATCH 49/97] python312Packages.niapy: 2.3.1 -> 2.5.1 --- pkgs/development/python-modules/niapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index f7cfecd8a5c17..575ee5043044f 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.3.1"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/v${version}"; - hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; + hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo="; }; build-system = [ poetry-core ]; From bc7e643a0cf5d8e9b3bbc206f57f2f37113fa3c9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Oct 2024 18:31:46 +0100 Subject: [PATCH 50/97] =?UTF-8?q?ocamlPackages.ppxlib:=200.32.1=20?= =?UTF-8?q?=E2=86=92=200.33.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ppxlib/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index bc849fa1ece3d..b64a5301fc32e 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -3,7 +3,7 @@ if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.11" - then "0.32.1" else "0.24.0" else "0.15.0" else "0.13.0" + then "0.33.0" else "0.24.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -67,6 +67,10 @@ let param = { sha256 = "sha256-nbrYvLHItPPfP1i8pgpe0j2GUx8No0tBlshr1YXAnX8="; min_version = "4.07"; }; + "0.33.0" = { + sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; + min_version = "4.07"; + }; }."${version}"; in if param ? max_version && lib.versionAtLeast ocaml.version param.max_version From e3f9eece4134864b95e1ef1deacdaedca30ae4a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:20:45 +0100 Subject: [PATCH 51/97] python312Packages.archinfo: 9.2.125 -> 9.2.126 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.125...v9.2.126 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index a236696763064..47eb444d07b52 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.125"; + version = "9.2.126"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-e1ndjrr62wpTkhPAYnfbObdx0YO8jMp09ymgszsivO4="; + hash = "sha256-LMRZMZeQZVDnIUyqtE90WI9uFHIPSm5d0duWw5ew054="; }; build-system = [ setuptools ]; From 8301a6b3b5c738e0e427885289563e2f26f1d763 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:20:53 +0100 Subject: [PATCH 52/97] python312Packages.ailment: 9.2.125 -> 9.2.126 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.125...v9.2.126 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 04c11fd603bff..7cbe3449b831d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.125"; + version = "9.2.126"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-ytwhCSlkp38Fff+bB/ep/FvY63vy/Gqxt+wMMziK0eY="; + hash = "sha256-C5hOeMdZ0D8T61TyJ8uEhuy+VnVc/6GQ3PteuicUpzA="; }; build-system = [ setuptools ]; From 9c7ab10443301d929cb5d6cba4cbb41549334194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:21:53 +0100 Subject: [PATCH 53/97] python312Packages.pyvex: 9.2.125 -> 9.2.126 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 26f0e096cce6c..eb0b5a212c605 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.125"; + version = "9.2.126"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-BgMOPR1Uat/IBCeY16A6kuSEPqs0vjP9Ili7cqqU5Qg="; + hash = "sha256-bi4DKqT+MFLCJgVN+EegED0d6XbUuZ2GS/vsHU6FMgw="; }; build-system = [ setuptools ]; From 6c9b7d0b77f07e57b43335241573f4fa5109915d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:22:08 +0100 Subject: [PATCH 54/97] python312Packages.claripy: 9.2.125 -> 9.2.126 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.125...v9.2.126 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7f3bba21a536a..a182aaf8da47f 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.125"; + version = "9.2.126"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-UYB7QnrUtVGeWv0SiEOuOhb53AbcijghIh+DIWwLsE4="; + hash = "sha256-clS7O0WVY9jtuG1RF8c+14nlN9/U/29fEtVNnmGslQU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From a50fa931cc82550a5700aa80522ea496dd9d5333 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:23:32 +0100 Subject: [PATCH 55/97] python312Packages.cle: 9.2.125 -> 9.2.126 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.126...v9.2.126 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index cba5e356d48aa..1029b65c8b532 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.125"; + version = "9.2.126"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-22srtaY8CWT+XqnSZpMndBEVe20rDL+2LpJr9MByyLU="; + hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO0="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-Xe9tOt94kSKsP0Xc8K0OaeyiUKFUkujZt9AsamgKwBw="; + hash = "sha256-aOt5ba/F05FMiH+HpTVHOD2sfQY/yFoO9A90MZlF7So="; }; build-system = [ setuptools ]; From 2bafee366aa233e6a0d78d16e01cde4eac73e432 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:25:29 +0100 Subject: [PATCH 56/97] python311Packages.angr: 9.2.125 -> 9.2.126 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.125...v9.2.126 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 5d59445244aae..dc9e0a19a3bb6 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.125"; + version = "9.2.126"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-srQhZ5eDTelqN2JEoXKpFT2MOy+6v0HhwSRBOU+0qUk="; + hash = "sha256-M74RNmjld7nuybotPjNZ1bYMDlYnOn1c/clS2ZlMe/o="; }; postPatch = '' From b1e04a2f78e17c840bc1437c128cd667ed6f7be5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:32:33 +0100 Subject: [PATCH 57/97] python312Packages.mypy-boto3-mediapackagev2: 1.35.33 -> 1.35.50 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0704af8156236..22911af2fd32f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -878,8 +878,8 @@ rec { "sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0="; mypy-boto3-mediapackagev2 = - buildMypyBoto3Package "mediapackagev2" "1.35.33" - "sha256-KUiz6fz0AZVZNFo6FpsfMYZHEFIXHzrvsSbulUWhARQ="; + buildMypyBoto3Package "mediapackagev2" "1.35.50" + "sha256-kvY0A+v7yJ/NUiqy8HnA4EmGOnbqlQI8lj70S4k5+dk="; mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.35.0" From 8513478b6ef0ae463025dae31478da89cd6fad47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:32:40 +0100 Subject: [PATCH 58/97] python312Packages.mypy-boto3-opensearch: 1.35.0 -> 1.35.50 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 22911af2fd32f..1f31fd8950096 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -970,8 +970,8 @@ rec { "sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.35.0" - "sha256-AQLU4or4flXLxTrZJy0XHIn9MFRTmgHjUWjLzuP2pXA="; + buildMypyBoto3Package "opensearch" "1.35.50" + "sha256-CeM1UMDYNuckpPVznJeB78BBbew/IM5ASKy1loUfDDs="; mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.35.2" From e4ed158cbab1b91a141a218d5f697ef755c2a312 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:32:50 +0100 Subject: [PATCH 59/97] python312Packages.mypy-boto3-rds: 1.35.46 -> 1.35.50 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 1f31fd8950096..3dd21a56bda06 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1086,8 +1086,8 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.46" - "sha256-A8cp4wbpd3E91PdxYV5F0V76YN5TEJKw4OVBMXKJZNI="; + buildMypyBoto3Package "rds" "1.35.50" + "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.28" From 94a910f4805b6c350c517e2dc59d8c4d0629f21e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:33:09 +0100 Subject: [PATCH 60/97] python312Packages.mypy-boto3-storagegateway: 1.35.18 -> 1.35.50 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3dd21a56bda06..b1aad19152733 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1326,8 +1326,8 @@ rec { "sha256-crU3Xc5EkSSrhBqNVS/LIQa4ssiMNtI1gNoCvhBedWs="; mypy-boto3-storagegateway = - buildMypyBoto3Package "storagegateway" "1.35.18" - "sha256-RiAqxt45cMOkbGjWVWufiqZcCKQm++RE3FOdZ5BFkuE="; + buildMypyBoto3Package "storagegateway" "1.35.50" + "sha256-60qxUQtbi+Dl2osn7zkSmpTuXf8DjTKDa3XXVsJynKE="; mypy-boto3-sts = buildMypyBoto3Package "sts" "1.35.0" From a8dc4b3904a905fc36c2bc041e34116e9e16dd45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 20:49:42 +0100 Subject: [PATCH 61/97] checkov: 3.2.269 -> 3.2.271 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.269...3.2.271 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.271 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index af7420b7f4f50..88d62e6a1be20 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.269"; + version = "3.2.271"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek="; + hash = "sha256-d0WUn/wrwDY+w2mTUBslwwzjwZ5wFhNtRubtN7DikEI="; }; patches = [ ./flake8-compat-5.x.patch ]; From 577ebd4379897e17845a3ed98ef6c90b267090ae Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 29 Oct 2024 22:02:07 +0100 Subject: [PATCH 62/97] vscode-extensions.visualjj.visualjj: 0.12.1 -> 0.12.2 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index d30107a1fb030..527e26c2d9c38 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -6,28 +6,28 @@ }: let - version = "0.12.1"; + version = "0.12.2"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-Tf26s4YDyjYUrVdKu9aYMMntirZyNRgnETMzO/EfFCA="; + hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-2u92qFaRIirCrvtuxeqVqt6zWEobS1f5SX26SGZF4xE="; + hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-+NUdF/KIWhLXOGtUgmNI9JF+L+f/4o064gznpLiORVM="; + hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-GVEOTgfSKc0YXZUF4WGl/56Jd4ucaeDm9nB+267BQoM="; + hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM="; }; }; in From a7685de5b4e81dc747dff9b5b4237cbc627ec887 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 22:31:45 +0100 Subject: [PATCH 63/97] python312Packages.niaaml: add missing inputs --- pkgs/development/python-modules/niaaml/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 30197c1683390..e457b9c79b4cd 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + loguru, niapy, numpy, pandas, @@ -10,6 +11,7 @@ pythonOlder, scikit-learn, toml-adapt, + typer, }: buildPythonPackage rec { @@ -34,10 +36,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + loguru niapy numpy pandas scikit-learn + typer ]; # create scikit-learn and niapy deps version consistent From 9c6cd049c308f41dcfbe03be834f0730fc2785ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 22:51:52 +0100 Subject: [PATCH 64/97] cnspec: 11.27.0 -> 11.28.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.27.0...v11.28.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.28.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index a13b265a640e9..7da7cddc59d90 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.27.0"; + version = "11.28.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-6B+OiIX/9NkbroOhM4zNbWoKDbequS1sBk6QNlVEG1I="; + hash = "sha256-vtefht623aXx6tUXb+MyKjGTyF4YQYQ/Huy8kEkjrVc="; }; proxyVendor = true; - vendorHash = "sha256-RjJ/UN0EvKTzR7XazRLStIht6wR0X7XIUDghMzRqEX4="; + vendorHash = "sha256-D8AZ1qPon4Ujiw96N79AAA14P0LFDL2W3kmpR4mhOa0="; subPackages = [ "apps/cnspec" ]; From a4a98bed2ed5455e5eb4786d82a261d9c383b0a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 22:59:18 +0100 Subject: [PATCH 65/97] python312Packages.androidtv: 0.0.73 -> 0.0.74 Diff: https://github.com/JeffLIrion/python-androidtv/compare/v0.0.73...v0.0.74 --- pkgs/development/python-modules/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index c277a6e28993e..361c39ac5fb39 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.73"; + version = "0.0.74"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak="; + hash = "sha256-aURHor+7E0Z4DyN/s1/BMBJo/FmvAlRsKs9Q0Thelyc="; }; propagatedBuildInputs = [ From 16bcced9b7dd815753a6311208eb85deea33ab7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Oct 2024 23:01:36 +0100 Subject: [PATCH 66/97] python312Packages.androidtv: refactor --- pkgs/development/python-modules/androidtv/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 361c39ac5fb39..5e1f96da14539 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -9,23 +9,26 @@ pure-python-adb, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "androidtv"; version = "0.0.74"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-aURHor+7E0Z4DyN/s1/BMBJo/FmvAlRsKs9Q0Thelyc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ adb-shell async-timeout pure-python-adb From a5b81808e21dd0d4015ccec9668d9aa3261b4f84 Mon Sep 17 00:00:00 2001 From: Ali Rizvi Date: Tue, 29 Oct 2024 18:47:12 -0400 Subject: [PATCH 67/97] libretro.citra: fix broken build (ffmpeg -> ffmpeg_6) --- pkgs/applications/emulators/retroarch/cores.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 18c510b8465b2..f30d55ee4395e 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -8,7 +8,7 @@ , curl , fetchFromGitHub , fetchpatch -, ffmpeg +, ffmpeg_6 , fluidsynth , fmt , freetype @@ -318,7 +318,7 @@ in citra = mkLibretroCore rec { core = "citra"; - extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; + extraBuildInputs = [ libGLU libGL boost ffmpeg_6 nasm ]; makefile = "Makefile"; makeFlags = [ "HAVE_FFMPEG_STATIC=0" From 8fbf618bb4397fcb267af8e844cc0f73d42cc94d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 23:32:31 +0000 Subject: [PATCH 68/97] dart-sass: 1.77.6 -> 1.80.5 --- pkgs/by-name/da/dart-sass/package.nix | 8 +- pkgs/by-name/da/dart-sass/pubspec.lock.json | 182 +++++++++++--------- 2 files changed, 103 insertions(+), 87 deletions(-) diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 579f96ce9b0f3..4e3b1dd9165d6 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -11,24 +11,24 @@ }: let - embedded-protocol-version = "2.7.1"; + embedded-protocol-version = "3.1.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ="; + hash = "sha256-DBoGACNhc9JMT8D+dO50aKUitY8xx/3IGj/XntFts1w="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.77.6"; + version = "1.80.5"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-GiZbx60HtyFTsargh0UVhjzOwlw3VWkhUEaX0s2ehos="; + hash = "sha256-A9e3GxOg1xkmOXjNyhg2ihnxKiMb2vORpwvAy+JWFZY="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 8c3f3c83dce3d..d22c50acf15f4 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.8.0" }, "archive": { "dependency": "direct dev", @@ -34,31 +40,31 @@ "dependency": "direct main", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" }, "async": { "dependency": "direct main", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "charcode": { "dependency": "direct main", @@ -104,121 +110,121 @@ "dependency": "direct dev", "description": { "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.4.2" }, "collection": { "dependency": "direct main", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "convert": { "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "sha256": "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.0" + "version": "1.10.0" }, "crypto": { "dependency": "direct dev", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.6" }, "csslib": { "dependency": "transitive", "description": { "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.0.2" }, "dart_mappable": { "dependency": "transitive", "description": { "name": "dart_mappable", - "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "sha256": "f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.2" + "version": "4.3.0" }, "dart_style": { "dependency": "direct dev", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dartdoc": { "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "76de402781a647e55f356f1ae4446a400a573421f84c95da13dda4754cdbcceb", + "sha256": "818bf58bd0325cb574df31e5c08969f0e690a9cb13826eaac2efc02c7e41655a", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.8" + "version": "8.1.0" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "frontend_server_client": { "dependency": "transitive", @@ -254,21 +260,21 @@ "dependency": "transitive", "description": { "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.4" + "version": "0.15.5" }, "http": { "dependency": "direct main", "description": { "name": "http", - "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "http_multi_server": { "dependency": "transitive", @@ -284,11 +290,11 @@ "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.1" }, "io": { "dependency": "transitive", @@ -334,11 +340,21 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "0.1.2-main.4" }, "markdown": { "dependency": "transitive", @@ -364,21 +380,21 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "2.0.0" }, "native_stack_traces": { "dependency": "transitive", @@ -394,11 +410,11 @@ "dependency": "direct main", "description": { "name": "native_synchronization", - "sha256": "ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab", + "sha256": "047fa3665d611e178edc167e56166714f125750f064d20216892f1cca69d9d1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.3.1" }, "node_interop": { "dependency": "direct main", @@ -424,11 +440,11 @@ "dependency": "transitive", "description": { "name": "oauth2", - "sha256": "c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42", + "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "2.0.3" }, "package_config": { "dependency": "direct main", @@ -444,11 +460,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "petitparser": { "dependency": "transitive", @@ -494,11 +510,11 @@ "dependency": "direct dev", "description": { "name": "pub_api_client", - "sha256": "cc3d2c93df3823553de6a3e7d3ac09a3f43f8c271af4f43c2795266090ac9625", + "sha256": "06321793e558b2dfac3a11098a530b816a8f752a5cf9208a382be9a418e3f5fc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.7.1" }, "pub_semver": { "dependency": "direct main", @@ -534,11 +550,11 @@ "dependency": "transitive", "description": { "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "retry": { "dependency": "transitive", @@ -554,11 +570,11 @@ "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -574,11 +590,11 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", @@ -594,11 +610,11 @@ "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "direct main", @@ -624,11 +640,11 @@ "dependency": "direct main", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "direct main", @@ -654,11 +670,11 @@ "dependency": "direct main", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.0" }, "term_glyph": { "dependency": "direct main", @@ -674,31 +690,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.7" + "version": "1.25.8" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.4" + "version": "0.6.5" }, "test_descriptor": { "dependency": "direct dev", @@ -734,11 +750,11 @@ "dependency": "direct main", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "uri": { "dependency": "transitive", @@ -754,11 +770,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.4" + "version": "14.3.1" }, "watcher": { "dependency": "direct main", @@ -774,31 +790,31 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.0" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.1.6" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.0.1" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -832,6 +848,6 @@ } }, "sdks": { - "dart": ">=3.3.0 <4.0.0" + "dart": ">=3.5.0 <4.0.0" } } From 17bef589002ba5f4e89655141078c1d20fca946a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 00:30:07 +0000 Subject: [PATCH 69/97] shopify-cli: 3.67.1 -> 3.69.3 --- pkgs/by-name/sh/shopify-cli/package-lock.json | 12 ++++++------ pkgs/by-name/sh/shopify-cli/package.json | 4 ++-- pkgs/by-name/sh/shopify-cli/package.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/package-lock.json index 791b8cf7a1758..7ed9710de6eb0 100644 --- a/pkgs/by-name/sh/shopify-cli/package-lock.json +++ b/pkgs/by-name/sh/shopify-cli/package-lock.json @@ -1,14 +1,14 @@ { "name": "shopify", - "version": "3.67.1", + "version": "3.69.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "shopify", - "version": "3.67.1", + "version": "3.69.3", "dependencies": { - "@shopify/cli": "3.67.1" + "@shopify/cli": "3.69.3" }, "bin": { "shopify": "node_modules/@shopify/cli/bin/run.js" @@ -480,9 +480,9 @@ } }, "node_modules/@shopify/cli": { - "version": "3.67.1", - "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.67.1.tgz", - "integrity": "sha512-yThhhrfV4M9cAx8Ng5DPoxEemtPtiIur1jiVJBp8cuooJMTHvjANZ3eOcs9xeKGb5BMzoseZ1jR5Gh8MYGCjQQ==", + "version": "3.69.3", + "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.69.3.tgz", + "integrity": "sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==", "license": "MIT", "os": [ "darwin", diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/package.json index 288f3e31876ab..d4515de77622d 100644 --- a/pkgs/by-name/sh/shopify-cli/package.json +++ b/pkgs/by-name/sh/shopify-cli/package.json @@ -1,11 +1,11 @@ { "name": "shopify", - "version": "3.67.1", + "version": "3.69.3", "private": true, "bin": { "shopify": "node_modules/@shopify/cli/bin/run.js" }, "dependencies": { - "@shopify/cli": "3.67.1" + "@shopify/cli": "3.69.3" } } diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index b0c74741be1ed..b49e430de8beb 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -1,6 +1,6 @@ { buildNpmPackage, lib, testers, shopify-cli }: let - version = "3.67.1"; + version = "3.69.3"; in buildNpmPackage { pname = "shopify"; @@ -14,7 +14,7 @@ buildNpmPackage { ]; }; - npmDepsHash = "sha256-jb87K1tCMYgWrsAgzvdHW8ChB+dvc9yNM0hqajy8Rbo="; + npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk="; dontNpmBuild = true; passthru = { From 5d5f5cb6efd50de1dfd6164d1a48bca66fb4190c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 29 Oct 2024 23:55:55 -0300 Subject: [PATCH 70/97] python312Packages.latexrestricted: 0.5.0 -> 0.6.0 Changelog: https://github.com/gpoore/latexrestricted/blob/v0.6.0/CHANGELOG.md --- pkgs/development/python-modules/latexrestricted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix index 1abc58cbd3cc6..dfccf69e05638 100644 --- a/pkgs/development/python-modules/latexrestricted/default.nix +++ b/pkgs/development/python-modules/latexrestricted/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "latexrestricted"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-PwhVKgoXujiLC+3FPAtUdvBEgeNwD6aBK+I5p8xeLwo="; + hash = "sha256-/N5eC32OVN6qxWZAwAUlCIrMV2ARitiX3gaCPiSCRHs="; }; build-system = [ setuptools ]; From 26261f98be061fdee747404773b86a373fd37e27 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Wed, 30 Oct 2024 10:20:12 +0700 Subject: [PATCH 71/97] oh-my-zsh: fix 'preLoaded' option documentation --- nixos/modules/programs/zsh/oh-my-zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 85dae5ba664bd..f1ed26ddb569f 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -93,7 +93,7 @@ in default = ""; description = '' Shell commands executed before the `oh-my-zsh` is loaded. - For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt force` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt) + For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt no` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt) ''; }; }; From cf9a1029400e8a635f04f4713713ef3750c1dcfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 04:05:35 +0000 Subject: [PATCH 72/97] yafc-ce: 2.0.1 -> 2.1.0 --- pkgs/by-name/ya/yafc-ce/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix index ea69b7154a509..7a76a6ceccb34 100644 --- a/pkgs/by-name/ya/yafc-ce/package.nix +++ b/pkgs/by-name/ya/yafc-ce/package.nix @@ -12,13 +12,13 @@ let in buildDotnetModule (finalAttrs: { pname = "yafc-ce"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "shpaass"; repo = "yafc-ce"; rev = finalAttrs.version; - hash = "sha256-qJOEdP2jRqK0E9Q4n7YgO5jyHxztb8aVOTlLDq1VvMk="; + hash = "sha256-dh+lnilwQSrbZNcRGpEXybsNYxkihZUp5t8co06ZXYE="; }; projectFile = [ "Yafc/Yafc.csproj" ]; From 9d81428514a027071791e576d32fa9164337eeaf Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 30 Oct 2024 06:23:28 +0000 Subject: [PATCH 73/97] xwayland: 24.1.3 -> 24.1.4 Changes: https://lists.x.org/archives/xorg-announce/2024-October/003545.html --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index db6d8c3259e35..8bfc01d799332 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.3"; + version = "24.1.4"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-3NtXpmzJsSTI+TZ2BZJiisTnRKfXsxeaqGGJrX6kyxA="; + hash = "sha256-2Wp426uBn1V1AXNERESZW1Ax69zBW3ev672NvAKvNPQ="; }; postPatch = '' From 90cc3274588c6c8bc64d0f9eae75ce721590b4bd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 30 Oct 2024 08:12:54 +0100 Subject: [PATCH 74/97] =?UTF-8?q?ocamlPackages.dns:=209.0.0=20=E2=86=92=20?= =?UTF-8?q?9.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 00ee104ad2097..bcc67a6f6ebf9 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "dns"; - version = "9.0.0"; + version = "9.1.0"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz"; - hash = "sha256-HvXwTLVKw0wHV+xftL/z+yNA6UjxUTSdo/cC+s3qy/Y="; + hash = "sha256-jz7JWs8U9XQhm1RAponq4azCpJyx2KBm+bI6esaPRPA="; }; propagatedBuildInputs = [ fmt logs ptime domain-name gmap ipaddr lru duration metrics base64 ohex ]; From 3f05472195cd6f77da01a3df972980deaed9bc4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 04:55:54 +0000 Subject: [PATCH 75/97] libcoap: 4.3.4a -> 4.3.5 --- pkgs/applications/networking/libcoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 5c3752046be39..d705536ea7dfe 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.4a"; + version = "4.3.5"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; + hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s="; }; nativeBuildInputs = [ automake From 2f0c3c88cb7fa82314e65d7f00011147607549a0 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Mon, 14 Oct 2024 13:24:25 +0000 Subject: [PATCH 76/97] nixos/murmur: support setting custom state directory --- nixos/modules/services/networking/murmur.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index c47a684571fea..3834dd5e4c45f 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -6,7 +6,7 @@ let cfg = config.services.murmur; forking = cfg.logFile != null; configFile = pkgs.writeText "murmurd.ini" '' - database=/var/lib/murmur/murmur.sqlite + database=${cfg.stateDir}/murmur.sqlite dbDriver=QSQLITE autobanAttempts=${toString cfg.autobanAttempts} @@ -69,6 +69,14 @@ in ''; }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/murmur"; + description = '' + Directory to store data for the server. + ''; + }; + autobanAttempts = mkOption { type = types.int; default = 10; @@ -257,7 +265,7 @@ in environmentFile = mkOption { type = types.nullOr types.path; default = null; - example = "/var/lib/murmur/murmurd.env"; + example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"''; description = '' Environment file as defined in {manpage}`systemd.exec(5)`. @@ -291,7 +299,7 @@ in config = mkIf cfg.enable { users.users.murmur = { description = "Murmur Service user"; - home = "/var/lib/murmur"; + home = cfg.stateDir; createHome = true; uid = config.ids.uids.murmur; group = "murmur"; @@ -387,9 +395,9 @@ in r ${config.environment.etc."os-release".source}, r ${config.environment.etc."lsb-release".source}, - owner rwk /var/lib/murmur/murmur.sqlite, - owner rw /var/lib/murmur/murmur.sqlite-journal, - owner r /var/lib/murmur/, + owner rwk ${cfg.stateDir}/murmur.sqlite, + owner rw ${cfg.stateDir}/murmur.sqlite-journal, + owner r ${cfg.stateDir}/, r /run/murmur/murmurd.pid, r /run/murmur/murmurd.ini, r ${configFile}, From acda73926d11b140c5499b932790aa5c0186c496 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Mon, 14 Oct 2024 13:28:12 +0000 Subject: [PATCH 77/97] nixos/murmur: support setting user and group for service --- nixos/modules/services/networking/murmur.nix | 30 ++++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 3834dd5e4c45f..9e346d3384fa3 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -69,6 +69,24 @@ in ''; }; + user = mkOption { + type = types.str; + default = "murmur"; + description = '' + The name of an existing user to use to run the service. + If not specified, the default user will be created. + ''; + }; + + group = mkOption { + type = types.str; + default = "murmur"; + description = '' + The name of an existing group to use to run the service. + If not specified, the default group will be created. + ''; + }; + stateDir = mkOption { type = types.path; default = "/var/lib/murmur"; @@ -297,14 +315,14 @@ in }; config = mkIf cfg.enable { - users.users.murmur = { + users.users.murmur = mkIf (cfg.user == "murmur") { description = "Murmur Service user"; home = cfg.stateDir; createHome = true; uid = config.ids.uids.murmur; - group = "murmur"; + group = cfg.group; }; - users.groups.murmur = { + users.groups.murmur = mkIf (cfg.group == "murmur") { gid = config.ids.gids.murmur; }; @@ -332,8 +350,8 @@ in Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; - User = "murmur"; - Group = "murmur"; + User = cfg.user; + Group = cfg.group; # service hardening AmbientCapabilities = "CAP_NET_BIND_SERVICE"; @@ -370,7 +388,7 @@ in "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - + From e0fb15a51b5bb52b2ac2673517781963f0c4d290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 10:37:22 +0000 Subject: [PATCH 78/97] pavucontrol: 6.0 -> 6.1 --- pkgs/applications/audio/pavucontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 027d3880bd9d1..a7ca399e49468 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -7,7 +7,7 @@ libpulseaudio, gtkmm4, libsigcxx, - # Since version 6.0, libcanberra is optional + # Since version 6.1, libcanberra is optional withLibcanberra ? true, libcanberra-gtk3, json-glib, @@ -20,14 +20,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; - version = "6.0"; + version = "6.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pulseaudio"; repo = "pavucontrol"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg="; + hash = "sha256-cru4I+LljYKIpIr7gSolnuLuUIXgc8l+JUmPrme4+YA="; }; buildInputs = [ From 91cf1d31c828cbabebdfbcd1e1fc1557adbed0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Oct 2024 18:16:30 +0200 Subject: [PATCH 79/97] nixos/zfs: fix shellcheck findings with enableStrictShellChecks enabled --- nixos/modules/tasks/filesystems/zfs.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 03b67438d7b62..d50b43b3777b4 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -57,6 +57,7 @@ let # latter case it makes one last attempt at importing, allowing the system to # (eventually) boot even with a degraded pool. importLib = {zpoolCmd, awkCmd, cfgZfs}: '' + # shellcheck disable=SC2013 for o in $(cat /proc/cmdline); do case $o in zfs_force|zfs_force=1|zfs_force=y) @@ -80,6 +81,7 @@ let } poolImport() { pool="$1" + # shellcheck disable=SC2086 "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool" } ''; @@ -146,7 +148,7 @@ let if ! poolImported "${pool}"; then echo -n "importing ZFS pool \"${pool}\"..." # Loop across the import until it succeeds, because the devices needed may not be discovered yet. - for trial in `seq 1 60`; do + for _ in $(seq 1 60); do poolReady "${pool}" && poolImport "${pool}" && break sleep 1 done @@ -157,7 +159,7 @@ let ${lib.optionalString keyLocations.hasKeys '' - ${keyLocations.command} | while IFS=$'\t' read ds kl ks; do + ${keyLocations.command} | while IFS=$'\t' read -r ds kl ks; do { if [[ "$ks" != unavailable ]]; then continue @@ -613,7 +615,7 @@ in echo -n "importing root ZFS pool \"${pool}\"..." # Loop across the import until it succeeds, because the devices needed may not be discovered yet. if ! poolImported "${pool}"; then - for trial in `seq 1 60`; do + for _ in $(seq 1 60); do poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break sleep 1 echo -n . @@ -865,6 +867,7 @@ in Type = "simple"; }; script = '' + # shellcheck disable=SC2046 ${cfgZfs.package}/bin/zpool scrub -w ${ if cfgScrub.pools != [] then (lib.concatStringsSep " " cfgScrub.pools) From 73824e231c1b8ce9edca5e9fb7251869eeba1cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 14 Oct 2024 18:15:59 +0200 Subject: [PATCH 80/97] nixos/hydra: fix shellcheck findings with enableStrictShellChecks enabled --- .../continuous-integration/hydra/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 189aaf86dd2d9..45d6b2428a46c 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -330,12 +330,12 @@ in ln -sf ${hydraConf} ${baseDir}/hydra.conf - mkdir -m 0700 -p ${baseDir}/www + mkdir -m 0700 ${baseDir}/www || true chown hydra-www:hydra ${baseDir}/www - mkdir -m 0700 -p ${baseDir}/queue-runner - mkdir -m 0750 -p ${baseDir}/build-logs - mkdir -m 0750 -p ${baseDir}/runcommand-logs + mkdir -m 0700 ${baseDir}/queue-runner || true + mkdir -m 0750 ${baseDir}/build-logs || true + mkdir -m 0750 ${baseDir}/runcommand-logs || true chown hydra-queue-runner:hydra \ ${baseDir}/queue-runner \ ${baseDir}/build-logs \ @@ -362,8 +362,8 @@ in # Move legacy hydra-www roots. if [ -e /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots ]; then - find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f \ - | xargs -r mv -f -t ${cfg.gcRootsDir}/ + find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f -print0 \ + | xargs -0 -r mv -f -t ${cfg.gcRootsDir}/ rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots fi @@ -520,7 +520,7 @@ in elif [[ $compression == zstd ]]; then compression="zstd --rm" fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet ''; startAt = "Sun 01:45"; serviceConfig.Slice = "system-hydra.slice"; From 68b021b3244d6464671494eb83015deeb0fe294a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 23 Oct 2024 14:49:17 +0200 Subject: [PATCH 81/97] xfsprogs: 6.9.0 -> 6.11.0 https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?id=e503e1e38032e9c0e04368d5d9e1cbba099232c9 --- pkgs/tools/filesystems/xfsprogs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index a95309053ad05..18cc521460874 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.9.0"; + version = "6.11.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-l1KEeD+z+8ThrmQL2ATXiOQjeoawdYKs7oa25I9lIbc="; + hash = "sha256-2uO7QyGW97GDsua9XcRL8z7b19DoW9N9JcI134G4EAo="; }; outputs = [ "bin" "dev" "out" "doc" ]; @@ -29,10 +29,13 @@ stdenv.mkDerivation rec { enableParallelInstalling = false; # @sbindir@ is replaced with /run/current-system/sw/bin to fix dependency cycles + # and '@pkg_state_dir@' should not point to the nix store, but we cannot use the configure parameter + # because then it will try to install to /var preConfigure = '' - for file in scrub/{xfs_scrub_all.cron.in,xfs_scrub@.service.in,xfs_scrub_all.service.in}; do + for file in scrub/*.in; do substituteInPlace "$file" \ - --replace '@sbindir@' '/run/current-system/sw/bin' + --replace-quiet '@sbindir@' '/run/current-system/sw/bin' \ + --replace-quiet '@pkg_state_dir@' '/var' done patchShebangs ./install-sh ''; From 847bfa248ba499f59ac527ba177fe91bde3b3a92 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 29 Oct 2024 21:38:43 +0000 Subject: [PATCH 82/97] pcsx2-bin: 2.1.205 -> 2.1.231 --- pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index 335cf8353f08c..71b64e23672f3 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.205"; + version = "2.1.231"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-m5OSxAUBJhokNd7AamQJmkKSMYd1JRidHVYLHpyb0IQ="; + hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA="; }; nativeBuildInputs = [ makeWrapper ]; From 4a78c0e982452b6d7dc3fb821f035df5191120e6 Mon Sep 17 00:00:00 2001 From: rczb Date: Sat, 19 Oct 2024 20:43:49 +0800 Subject: [PATCH 83/97] c-intro-and-ref: init at 0.0-unstable-2024-08-31 Co-authored-by: Lin Jian --- pkgs/by-name/c-/c-intro-and-ref/package.nix | 71 +++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/c-/c-intro-and-ref/package.nix diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix new file mode 100644 index 0000000000000..b1b212e1c7650 --- /dev/null +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromSavannah, + texinfo, + texliveBasic, + ghostscript, + unstableGitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "c-intro-and-ref"; + version = "0.0-unstable-2024-08-31"; + + src = fetchFromSavannah { + repo = "c-intro-and-ref"; + rev = "62962013107481127176ef04d69826e41f51313c"; + hash = "sha256-Fmli3x8zvPntvCvV/wbEkxWzW9uDMZgCElPkKo9TS6Y="; + }; + + nativeBuildInputs = [ + texinfo + ghostscript + texliveBasic + ]; + + buildFlags = [ + "c.info" + "c.dvi" + "c.pdf" + # FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm + # "c.doc" + "c.html" + "c.html.d" + "c.txt" + ]; + + installPhase = '' + runHook preInstall + dst_info=$out/share/info + dst_doc=$out/share/doc/c-intro-and-ref + mkdir -p $dst_info + mkdir -p $dst_doc + + cp -prv -t $dst_info \ + c.info c.info-* + cp -prv -t $dst_doc \ + c.dvi \ + c.pdf \ + c.html \ + c.html.d \ + c.txt + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "GNU C Language Intro and Reference Manual"; + longDescription = '' + This manual explains the C language for use with the GNU Compiler + Collection (GCC) on the GNU/Linux operating system and other systems. We + refer to this dialect as GNU C. If you already know C, you can use this as + a reference manual. + ''; + homepage = "https://www.gnu.org/software/c-intro-and-ref/"; + changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}"; + license = lib.licenses.fdl13Plus; + maintainers = with lib.maintainers; [ rc-zb ]; + platforms = lib.platforms.all; + }; +}) From 806fb7cb5e992bb2b6c4290c666223bc22d6ed89 Mon Sep 17 00:00:00 2001 From: git Date: Sun, 27 Oct 2024 12:48:59 +0100 Subject: [PATCH 84/97] hostmux: add updater --- pkgs/tools/misc/hostmux/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/hostmux/default.nix b/pkgs/tools/misc/hostmux/default.nix index 27e714a5e7f7d..62be6e821306a 100644 --- a/pkgs/tools/misc/hostmux/default.nix +++ b/pkgs/tools/misc/hostmux/default.nix @@ -4,6 +4,7 @@ , installShellFiles , openssh , tmux +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { @@ -43,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Small wrapper script for tmux to easily connect to a series of hosts via ssh and open a split pane for each of the hosts"; homepage = "https://github.com/hukl/hostmux"; From f8ec48bd3772e6cc82d3a8a259172e5166510f4d Mon Sep 17 00:00:00 2001 From: Udo Sauer Date: Tue, 29 Oct 2024 17:07:02 +0100 Subject: [PATCH 85/97] hostmux: 1.4.0 -> 1.4.1 update version and adjust replacing the tmux variable, due to changes in the script --- pkgs/tools/misc/hostmux/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/hostmux/default.nix b/pkgs/tools/misc/hostmux/default.nix index 62be6e821306a..ac282c9f55ca3 100644 --- a/pkgs/tools/misc/hostmux/default.nix +++ b/pkgs/tools/misc/hostmux/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hostmux"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "hukl"; repo = "hostmux"; rev = finalAttrs.version; - hash = "sha256-odN7QFsU3MsWW8VabVjZH+8+AUFOUio8eF9ORv9iPEA="; + hash = "sha256-Rh8eyKoUydixj+X7muWleZW9u8djCQAyexIfRWIOr0o="; }; nativeBuildInputs = [ @@ -29,9 +29,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace hostmux \ - --replace "SSH_CMD=ssh" "SSH_CMD=${openssh}/bin/ssh" \ - --replace "tmux -2" "${tmux}/bin/tmux -2" \ - --replace "tmux s" "${tmux}/bin/tmux s" + --replace "SSH_CMD=ssh" "SSH_CMD=${lib.getExe openssh}" \ + --replace "TMUX_CMD=tmux" "TMUX_CMD=${lib.getExe tmux}" ''; installPhase = '' From 4e5d73b1b8a0ebe5d361cac9a03e011009e0aa2b Mon Sep 17 00:00:00 2001 From: Udo Sauer Date: Tue, 29 Oct 2024 17:07:40 +0100 Subject: [PATCH 86/97] hostmux: add meta.changelog --- pkgs/tools/misc/hostmux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/hostmux/default.nix b/pkgs/tools/misc/hostmux/default.nix index ac282c9f55ca3..405383d648bec 100644 --- a/pkgs/tools/misc/hostmux/default.nix +++ b/pkgs/tools/misc/hostmux/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Small wrapper script for tmux to easily connect to a series of hosts via ssh and open a split pane for each of the hosts"; homepage = "https://github.com/hukl/hostmux"; + changelog = "https://github.com/hukl/hostmux/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "hostmux"; maintainers = with lib.maintainers; [ fernsehmuell ]; From e727b10cc0bff1fbe9bd08ffecf8447e8e96c5f7 Mon Sep 17 00:00:00 2001 From: Josh Spicer Date: Wed, 30 Oct 2024 03:26:15 -0700 Subject: [PATCH 87/97] nixos/hackrf: document group requirement (#344118) --- nixos/modules/hardware/hackrf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/hardware/hackrf.nix b/nixos/modules/hardware/hackrf.nix index 7f03b765bbdaf..467fd71ff1b06 100644 --- a/nixos/modules/hardware/hackrf.nix +++ b/nixos/modules/hardware/hackrf.nix @@ -12,6 +12,7 @@ in description = '' Enables hackrf udev rules and ensures 'plugdev' group exists. This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev. + Ensure your user is a member of the 'plugdev' group after enabling. ''; }; }; From d7ebab2154e993543812034dbf0083363183c84b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:55:54 +0200 Subject: [PATCH 88/97] electron-source.electron_31: 31.6.0 -> 31.7.2 - Changelog: https://github.com/electron/electron/releases/tag/v31.7.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.6.0...v31.7.2 --- pkgs/development/tools/electron/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 046de00cf35e0..fbd3edaf42d4d 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -964,10 +964,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=", + "hash": "sha256-OlnSVTCfhl8Gl6DHG6JBi/x0G9cXar1KC3mfxcZ3y1Y=", "owner": "electron", "repo": "electron", - "rev": "v31.6.0" + "rev": "v31.7.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1211,10 +1211,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", "owner": "nodejs", "repo": "node", - "rev": "v20.17.0" + "rev": "v20.18.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1852,10 +1852,10 @@ "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194", + "electron_yarn_hash": "0mkq703idswn1qdmrm21ra58pa69hz79hyhaqnigyc854qf4k6w2", "modules": "125", - "node": "20.17.0", - "version": "31.6.0" + "node": "20.18.0", + "version": "31.7.2" }, "32": { "chrome": "128.0.6613.186", From 267cf52586a26bcc7ed65cf176b699cc37a929a9 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:57:04 +0200 Subject: [PATCH 89/97] electron-chromedriver_31: 31.6.0 -> 31.7.2 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 55e31c5b16417..6df27ec077644 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,14 +23,14 @@ }, "31": { "hashes": { - "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f", - "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9", - "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2", - "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", - "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a", - "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402" + "aarch64-darwin": "e49778b48b971b06e965aa2a3cd07194a4c4c1f66e3a3565e97f21a94865fea8", + "aarch64-linux": "9a28b5402e88b74657e2e89eeafbeedc9fed3ec1f36f408ddeef12871042278d", + "armv7l-linux": "465f71ab1385c3538f10d1d463fc482be04ab3e53b0a31291e124f1b88d175ca", + "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj", + "x86_64-darwin": "8ede4560f070f8d7e08e1c71f4135c10b164a077befe255110b957d32b865db5", + "x86_64-linux": "b3d19e86d5fc4d49c7e340282e421590ee1a81d6a75fdf4aea85b36e2c39d8a9" }, - "version": "31.6.0" + "version": "31.7.2" }, "32": { "hashes": { From d00a0b0d2160202d89e092ffb73fe1d6d8d4921f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:41:18 +0200 Subject: [PATCH 90/97] electron-source.electron_32: 32.2.1 -> 32.2.2 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index fbd3edaf42d4d..e59023b25a4a8 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1905,10 +1905,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=", + "hash": "sha256-RrQMeFf3notm96BJJgctXU/0azABY4axQ8VIEQsG4Gk=", "owner": "electron", "repo": "electron", - "rev": "v32.2.1" + "rev": "v32.2.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2796,7 +2796,7 @@ "electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9", "modules": "128", "node": "20.18.0", - "version": "32.2.1" + "version": "32.2.2" }, "33": { "chrome": "130.0.6723.44", From ad47be2ae58023989e7953cdc9c766f11158772e Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:42:02 +0200 Subject: [PATCH 91/97] electron-chromedriver_32: 32.2.1 -> 32.2.2 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6df27ec077644..c8a3c86604f9e 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec", - "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00", - "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7", - "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", - "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b", - "x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297" + "aarch64-darwin": "0ed199847a33fafa4482e1a49e5e8394f09a433eb5f2e638e25faac80ce2d435", + "aarch64-linux": "fb6f143eaff79c7096a8c2164d8b30dcd564056e1b9ec7e30b1290d8c5ec2b10", + "armv7l-linux": "15350e535ed59660f3d2082d13231a56f847f3e3deaeb05c3fd714629322492c", + "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi", + "x86_64-darwin": "af52397c32446f114619d5cd2ec6d83748095a0cd6a5c0c95479397e4ed30be5", + "x86_64-linux": "05a35b7b2d77012bef8c9920cec87f4356aff191aa7009ffaa2e8e3cfac888e4" }, - "version": "32.2.1" + "version": "32.2.2" }, "33": { "hashes": { From 282801342d38f6acffae53981f7b7a65737bb743 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:11:32 +0200 Subject: [PATCH 92/97] electron-source.electron_33: 33.0.0 -> 33.0.2 - Changelog: https://github.com/electron/electron/releases/tag/v33.0.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.0.0...v33.0.2 --- pkgs/development/tools/electron/info.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index e59023b25a4a8..aad3cfba40091 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2799,7 +2799,7 @@ "version": "32.2.2" }, "33": { - "chrome": "130.0.6723.44", + "chrome": "130.0.6723.59", "chromium": { "deps": { "gn": { @@ -2809,15 +2809,15 @@ "version": "2024-09-09" } }, - "version": "130.0.6723.44" + "version": "130.0.6723.59" }, "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zCyzVI6qbI1qTT0QBpVxLgNF5+L/Ym8WF6175/hv9k0=", + "hash": "sha256-8AsyUWYjYNczlybVCsvR5YEaL+Ak4Sth7ZA5n6gUjss=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "130.0.6723.44", + "rev": "130.0.6723.59", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -2846,10 +2846,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-8Y6jzjaLseSR4JPurofSG8Bs0m7wJucn4cwIc+z89sM=", + "hash": "sha256-0Ftjs2hvO7ySECm9U3JFOBtb/VgEHchTfnAoo45sOj8=", "owner": "electron", "repo": "electron", - "rev": "v33.0.0" + "rev": "v33.0.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2877,8 +2877,8 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-B/xH9kMuOcExMyp5wtk/CeJtUogmnwmMpfaTDpE3pio=", - "rev": "3cabe8c25ad30b0761ee74bc4d9f455cb5ba84c7", + "hash": "sha256-k9moMf40yao+FxWT6c/JBu0z/oI+U26LnqUwoweA0SU=", + "rev": "21e4b689c009a93f66d61989a713d52bceaf2979", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { @@ -3075,8 +3075,8 @@ }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GUpeszdPsCfN+RSg6vRTyfxwD0/TEtWmBEIcIUwYhBg=", - "rev": "88446977cb017f143f1ff6963d384b05a4414f54", + "hash": "sha256-brsMWPV8xleRMMUnrONL23kJyy3C98p59nPkGCMUTM0=", + "rev": "b99303161bf24247ed677a5be454dab24ebdced5", "url": "https://chromium.googlesource.com/devtools/devtools-frontend" }, "src/third_party/dom_distiller_js/dist": { @@ -3749,6 +3749,6 @@ "electron_yarn_hash": "0x3hk02diq4ss2405m44r4nb144h213vqr5hr4gmy04p6drk76qv", "modules": "130", "node": "20.18.0", - "version": "33.0.0" + "version": "33.0.2" } } From 96f372efd0f8a62975481b8a79205764a6a6f85f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:12:50 +0200 Subject: [PATCH 93/97] electron-chromedriver_33: 33.0.0 -> 33.0.2 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index c8a3c86604f9e..2ff177f3567a1 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,13 +45,13 @@ }, "33": { "hashes": { - "aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3", - "aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3", - "armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56", - "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", - "x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166", - "x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea" + "aarch64-darwin": "31b21d4f0798b0a91e7b41fd354c8d6b64345668db2948a8b0ebe9dc33992102", + "aarch64-linux": "d79008c5024612d94bb03c20c753fc93e66cbc49fa4d56438e249b1e3bfb4d68", + "armv7l-linux": "b2afa0b00e88dd5bb5bffafa8ffbb0501fbcc0bb7d67eacda46026bf92d92590", + "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c", + "x86_64-darwin": "aeeca15c1925c57fa91f71b56781270549eb4cd7a82ed423335cb5a2e92fa0b0", + "x86_64-linux": "ace2073bfe2e9c340255b6a33ad2df61070e002bea645ce522b63a466428bd5e" }, - "version": "33.0.0" + "version": "33.0.2" } } From d67fb59934b0d1cd9dde7eb8f0ba09aa42e62b08 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 24 Oct 2024 20:13:22 +0200 Subject: [PATCH 94/97] electron-source: fix update script for electron >= 33 --- pkgs/development/tools/electron/update.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index 14ccfe6d84a36..81e00691ae12c 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -182,18 +182,16 @@ class GitilesRepo(Repo): def __init__(self, url: str, rev: str) -> None: super().__init__() self.fetcher = "fetchFromGitiles" - # self.fetcher = 'fetchgit' self.args = { "url": url, "rev": rev, - # "fetchSubmodules": "false", } if url == "https://chromium.googlesource.com/chromium/src.git": self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; " self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; " self.args["postFetch"] += "rm -r $out/content/test/data; " - self.args["postFetch"] += "rm -r $out/courgette/testdata; " + self.args["postFetch"] += "rm -rf $out/courgette/testdata; " self.args["postFetch"] += "rm -r $out/extensions/test/data; " self.args["postFetch"] += "rm -r $out/media/test/data; " From 690caf0ab245ff336df31d82dac2687e5b54edbd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:08:06 +0200 Subject: [PATCH 95/97] electron_33-bin: 33.0.0 -> 33.0.2 - Changelog: https://github.com/electron/electron/releases/tag/v33.0.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.0.0...v33.0.2 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 2ed339ff79439..f3f4fe1676cea 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -78,13 +78,13 @@ }, "33": { "hashes": { - "aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2", - "aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1", - "armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063", - "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f", - "x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1", - "x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66" + "aarch64-darwin": "2d31f140b1a6cfa6efb509e644dee5830601e4d73d47539a8af20d57e8ae7b12", + "aarch64-linux": "43157d520ff6094ef7c390e49d1eec1ba58a488e150114c08e7157fb321fca7b", + "armv7l-linux": "1cb4a8422addfbb109a26f3cb4f406d793e5f04617bdc34b825dd17d84045906", + "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c", + "x86_64-darwin": "4bf99f30f124b447ef3b178e5ba0cdfe1faefa6a725bcde76a35eb26a50d4333", + "x86_64-linux": "933dc1eae3f2db67912b3ab056fd15a7ca3e1328fe8dd6a1f5266c5a063b1121" }, - "version": "33.0.0" + "version": "33.0.2" } } From b743d8cc8c795b6a512fda9a28d05d01778c085c Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:08:52 +0200 Subject: [PATCH 96/97] electron_32-bin: 32.2.1 -> 32.2.2 - Changelog: https://github.com/electron/electron/releases/tag/v32.2.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.2.1...v32.2.2 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index f3f4fe1676cea..0b81021dd06b0 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -67,14 +67,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259", - "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342", - "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc", - "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm", - "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907", - "x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185" + "aarch64-darwin": "c3fd68b5bdf0346c99b7c6bf41804dcaa74701847f5bbc58d25c261d33056967", + "aarch64-linux": "5587eeed9c507fc0f62006cb5206b37cd335d34ad0ae692d1c44b8009e2c0ab7", + "armv7l-linux": "cd44653e3602136a9dabef1db9305df8b1a24e77ace24f0cccbeed1fc041ce2c", + "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi", + "x86_64-darwin": "4ee209cdf27df4af79fad026a24b3df120ff9c89c2bdbc68ab5478fa7f32f5d7", + "x86_64-linux": "0b515f5ba76e919540af17251a4ce4bc355fdb497fcd7bd47d689872a1aae82c" }, - "version": "32.2.1" + "version": "32.2.2" }, "33": { "hashes": { From 0bf0c12ab55e3fd000bf21695a0b2251f7b21ef2 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:09:41 +0200 Subject: [PATCH 97/97] electron_31-bin: 31.6.0 -> 32.7.2 - Changelog: https://github.com/electron/electron/releases/tag/v31.7.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.6.0...v31.7.2 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 0b81021dd06b0..e6f6c9f38f11c 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -56,14 +56,14 @@ }, "31": { "hashes": { - "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb", - "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd", - "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741", - "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", - "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a", - "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67" + "aarch64-darwin": "d275eebc7cdaa1374e18ca97fe864767642203d89a0c66a49ed2e37acd11ff1c", + "aarch64-linux": "b67eb45065b3045041ccca358a9b608ff2fce9eb08ab45085b43c69790476e21", + "armv7l-linux": "58a257d20535933982ed27b5b58a79222e7b95b8fd24e057c06140755a03be10", + "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj", + "x86_64-darwin": "1d64ae2924c92ee56bbd195076e125c80cc9cb47ebd88700600a504f212c3057", + "x86_64-linux": "bab1b66aa54d3d32e98c1b298a8c5ef38a2adb6205b697e34ea5fa1aec7727aa" }, - "version": "31.6.0" + "version": "31.7.2" }, "32": { "hashes": {