From 55fd2e6ebf0ccdaf3d00e73c64414a217f1e4564 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 01/39] zgv: fix GCC 14 build --- pkgs/applications/graphics/zgv/add-include.patch | 11 +++++++++++ pkgs/applications/graphics/zgv/default.nix | 1 + 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/graphics/zgv/add-include.patch diff --git a/pkgs/applications/graphics/zgv/add-include.patch b/pkgs/applications/graphics/zgv/add-include.patch new file mode 100644 index 000000000000..2d6d1b90c960 --- /dev/null +++ b/pkgs/applications/graphics/zgv/add-include.patch @@ -0,0 +1,11 @@ +diff --git a/src/modesel.c b/src/modesel.c +--- src/modesel.c ++++ src/modesel.c +@@ -6,6 +6,7 @@ + */ + + #include ++#include + #include "zgv_io.h" + #include "readnbkey.h" + #include "modesel.h" diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 457d233176b9..25690e80480a 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ]; patches = [ + ./add-include.patch (fetchpatch { url = "https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch"; sha256 = "1blw9n04c28bnwcmcn64si4f5zpg42s8yn345js88fyzi9zm19xw"; From 62b2914c44043a3c4935625a60b2000db68660b3 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 23 Feb 2025 16:55:22 +0200 Subject: [PATCH 02/39] wine64Packages.{unstable,staging}: 10.0 -> 10.2 --- pkgs/applications/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 4dca84788169..d8123435e9fa 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.0"; - url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; - hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; + version = "10.2"; + url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; + hash = "sha256-nZDfts8QuBCntHifAGdxK0cw0+oqiLkfG+Jzsq0EJD8="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4="; + hash = "sha256-qWje1nJ5LIVFj5PmB6RRITYOWGovXzCLEVFTazmp30o="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From 2df9bf3523b66dbe5a8af28263d6f3a37ca523e8 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 23 Feb 2025 16:56:23 +0200 Subject: [PATCH 03/39] Add wineWow64Packages as acceptable test targets Signed-off-by: Alexander V. Nikolaev --- nixos/tests/wine.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index ab7fbf6a0713..321469f72e68 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -75,5 +75,14 @@ listToAttrs ( # This wayland combination times out after spending many hours. # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux (pkgs.lib.remove "wayland" variants) + ++ + map + (makeWineTest "wineWow64Packages" [ + hello32 + hello64 + ]) + # This wayland combination times out after spending many hours. + # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux + (pkgs.lib.remove "wayland" variants) ) ) From 6e27715c6d890279e3e28e047bf82306e27eb007 Mon Sep 17 00:00:00 2001 From: Palmer Cox Date: Sun, 23 Feb 2025 21:01:00 -0500 Subject: [PATCH 04/39] saga: Fix compiling on Darwin --- pkgs/by-name/sa/saga/darwin-patch-1.patch | 30 +++++++++++++++++++++++ pkgs/by-name/sa/saga/darwin-patch-2.patch | 24 ++++++++++++++++++ pkgs/by-name/sa/saga/package.nix | 8 ++++++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/by-name/sa/saga/darwin-patch-1.patch create mode 100644 pkgs/by-name/sa/saga/darwin-patch-2.patch diff --git a/pkgs/by-name/sa/saga/darwin-patch-1.patch b/pkgs/by-name/sa/saga/darwin-patch-1.patch new file mode 100644 index 000000000000..224a66204aca --- /dev/null +++ b/pkgs/by-name/sa/saga/darwin-patch-1.patch @@ -0,0 +1,30 @@ +commit 3bbd15676dfc077d7836e9d51810c1d6731f5789 +Author: Palmer Cox +Date: Sun Feb 23 16:41:18 2025 -0500 + + Fix copy/paste error in FindPostgres.cmake + + In f51c6b1513e312002c108fe87d26e33c48671406, EXEC_PROGRAM was changed to + execute_process. As part of that, it looks like the second and third + invocations were accidentally changed. + +diff --git a/saga-gis/cmake/modules/FindPostgres.cmake b/saga-gis/cmake/modules/FindPostgres.cmake +index f22806fd9..a4b6ec9ac 100644 +--- a/cmake/modules/FindPostgres.cmake ++++ b/cmake/modules/FindPostgres.cmake +@@ -77,13 +77,13 @@ ELSE(WIN32) + SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL) + + # set LIBRARY_DIR +- execute_process(COMMAND ${POSTGRES_CONFIG} --includedir ++ execute_process(COMMAND ${POSTGRES_CONFIG} --libdir + OUTPUT_VARIABLE PG_TMP + OUTPUT_STRIP_TRAILING_WHITESPACE) + IF (APPLE) + SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL) + ELSEIF (CYGWIN) +- execute_process(COMMAND ${POSTGRES_CONFIG} --includedir ++ execute_process(COMMAND ${POSTGRES_CONFIG} --libs + OUTPUT_VARIABLE PG_TMP + OUTPUT_STRIP_TRAILING_WHITESPACE) + diff --git a/pkgs/by-name/sa/saga/darwin-patch-2.patch b/pkgs/by-name/sa/saga/darwin-patch-2.patch new file mode 100644 index 000000000000..af601923d6ef --- /dev/null +++ b/pkgs/by-name/sa/saga/darwin-patch-2.patch @@ -0,0 +1,24 @@ +commit eb69f594ec439309432e87834bead5276b7dbc9b +Author: Palmer Cox +Date: Sun Feb 23 16:45:34 2025 -0500 + + On Apple, use FIND_LIBRARY to locate libpq + + I think FIND_LIBRARY() is better than just relying on what pg_config + said its libdir was, since, depending on how libpq was installed, it may + or may not be in that directory. If its not, FIND_LIBRARY() is able to + find it in other locations. + +diff --git a/saga-gis/cmake/modules/FindPostgres.cmake b/saga-gis/cmake/modules/FindPostgres.cmake +index a4b6ec9ac..65e7ac69b 100644 +--- a/cmake/modules/FindPostgres.cmake ++++ b/cmake/modules/FindPostgres.cmake +@@ -81,7 +81,7 @@ ELSE(WIN32) + OUTPUT_VARIABLE PG_TMP + OUTPUT_STRIP_TRAILING_WHITESPACE) + IF (APPLE) +- SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL) ++ FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq PATHS ${PG_TMP}) + ELSEIF (CYGWIN) + execute_process(COMMAND ${POSTGRES_CONFIG} --libs + OUTPUT_VARIABLE PG_TMP diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 7de5a63f4228..011c1929df58 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -43,6 +43,14 @@ stdenv.mkDerivation rec { sourceRoot = "saga-${version}/saga-gis"; + patches = [ + # Patches from https://sourceforge.net/p/saga-gis/code/merge-requests/38/. + # These are needed to fix building on Darwin (technically the first is not + # required, but the second doesn't apply without it). + ./darwin-patch-1.patch + ./darwin-patch-2.patch + ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 From 2beaf5e5a6afa53b2f8a1943ff2bb17024ca8e24 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 1 Mar 2025 05:34:24 +0100 Subject: [PATCH 05/39] quba: Add support for darwin --- pkgs/by-name/qu/quba/package.nix | 71 +++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix index 1be9b1a481a7..18e95f6bc801 100644 --- a/pkgs/by-name/qu/quba/package.nix +++ b/pkgs/by-name/qu/quba/package.nix @@ -1,29 +1,14 @@ { lib, + stdenvNoCC, appimageTools, fetchurl, + _7zz, }: let - version = "1.4.2"; pname = "quba"; - - src = fetchurl { - url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}.AppImage"; - hash = "sha256-3goMWN5GeQaLJimUKbjozJY/zJmqc9Mvy2+6bVSt1p0="; - }; - - appimageContents = appimageTools.extractType1 { inherit pname version src; }; -in -appimageTools.wrapType1 { - inherit pname version src; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; + version = "1.4.2"; meta = { description = "Viewer for electronic invoices"; @@ -32,6 +17,52 @@ appimageTools.wrapType1 { license = lib.licenses.asl20; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ onny ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; }; -} + + src = fetchurl { + url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}.AppImage"; + hash = "sha256-3goMWN5GeQaLJimUKbjozJY/zJmqc9Mvy2+6bVSt1p0="; + }; + + appimageContents = appimageTools.extractType1 { inherit pname version src; }; + + linux = appimageTools.wrapType1 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/quba.desktop -t $out/share/applications + substituteInPlace $out/share/applications/quba.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=quba' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + }; + + darwin = stdenvNoCC.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}-universal.dmg"; + hash = "sha256-q7va2D9AT0BoPhfkub/RFQxGyF12uFaCDpSYIxslqMc="; + }; + + unpackCmd = "7zz x -bd -osource -xr'!*/Applications' -xr'!*com.apple.provenance' $curSrc"; + + nativeBuildInputs = [ _7zz ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + mv Quba.app $out/Applications + + runHook postInstall + ''; + }; +in +if stdenvNoCC.hostPlatform.isLinux then linux else darwin From 798804c030c2c30090a5729df7e486cc3518a68d Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sat, 1 Mar 2025 22:59:52 +0800 Subject: [PATCH 06/39] bed: init at 0.2.8 --- pkgs/by-name/be/bed/package.nix | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/be/bed/package.nix diff --git a/pkgs/by-name/be/bed/package.nix b/pkgs/by-name/be/bed/package.nix new file mode 100644 index 000000000000..a4baa4b38087 --- /dev/null +++ b/pkgs/by-name/be/bed/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + which, + versionCheckHook, + nix-update-script, +}: +buildGoModule rec { + pname = "bed"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "itchyny"; + repo = "bed"; + tag = "v${version}"; + hash = "sha256-NXTQMyCI4PKaQPxZqklH03BEDMUrTCNtFUj2FNwIsNM="; + }; + vendorHash = "sha256-tp83T6V4HM7SgpZASMWnIoqgw/s/DhdJMsCu2C6OuTo="; + + nativeBuildInputs = [ which ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "-version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Binary editor written in Go"; + homepage = "https://github.com/itchyny/bed"; + changelog = "https://github.com/itchyny/bed/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "bed"; + }; +} From c8fab731982eb9307be138766d2b7c0bc85da2f7 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sat, 1 Mar 2025 23:30:45 +0800 Subject: [PATCH 07/39] mdtsql: init at 0.1.0 --- pkgs/by-name/md/mdtsql/package.nix | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/md/mdtsql/package.nix diff --git a/pkgs/by-name/md/mdtsql/package.nix b/pkgs/by-name/md/mdtsql/package.nix new file mode 100644 index 000000000000..69c3935d2934 --- /dev/null +++ b/pkgs/by-name/md/mdtsql/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + nix-update-script, +}: +buildGoModule rec { + pname = "mdtsql"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "noborus"; + repo = "mdtsql"; + tag = "v${version}"; + hash = "sha256-D9suWLrVQOztz0rRjEo+pjxQlGWOOsk3EUbkN9yuriY="; + }; + + vendorHash = "sha256-psXnLMhrApyBjDY/S4WwIM1GLczyn4dUmX2fWSTq7mQ="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd mdtsql \ + --bash <(${emulator} $out/bin/mdtsql completion bash) \ + --fish <(${emulator} $out/bin/mdtsql completion fish) \ + --zsh <(${emulator} $out/bin/mdtsql completion zsh) + '' + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Execute SQL to markdown table and convert to other format"; + homepage = "https://github.com/noborus/mdtsql"; + changelog = "https://github.com/noborus/mdtsql/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "mdtsql"; + }; +} From cc026dfbf5c2d4677ce5ef5807a928447cb486b3 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sat, 1 Mar 2025 23:49:04 +0800 Subject: [PATCH 08/39] xlsxsql: init at 0.4.0 --- pkgs/by-name/xl/xlsxsql/package.nix | 61 +++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/xl/xlsxsql/package.nix diff --git a/pkgs/by-name/xl/xlsxsql/package.nix b/pkgs/by-name/xl/xlsxsql/package.nix new file mode 100644 index 000000000000..21b98b2ade6e --- /dev/null +++ b/pkgs/by-name/xl/xlsxsql/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + versionCheckHook, + nix-update-script, +}: +buildGoModule rec { + pname = "xlsxsql"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "noborus"; + repo = "xlsxsql"; + tag = "v${version}"; + hash = "sha256-OmNYrohWs4l7cReTBB6Ha9VuKPit1+P7a4QKhYwK5g8="; + }; + + vendorHash = "sha256-Zrt4NMoQePvipFyYpN+Ipgl2D6j/thCPhrQy4AbXOfQ="; + + ldflags = [ + "-X main.version=v${version}" + "-X main.revision=${src.rev}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd xlsxsql \ + --bash <(${emulator} $out/bin/xlsxsql completion bash) \ + --fish <(${emulator} $out/bin/xlsxsql completion fish) \ + --zsh <(${emulator} $out/bin/xlsxsql completion zsh) + '' + ); + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool that executes SQL queries on various files including xlsx files and outputs the results to various files"; + homepage = "https://github.com/noborus/xlsxsql"; + changelog = "https://github.com/noborus/xlsxsql/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "xlsxsql"; + }; +} From 723c29aaf485197de62af43e57b40b7cecae22a9 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 2 Mar 2025 00:10:58 +0800 Subject: [PATCH 09/39] xo: init at 1.0.2 --- pkgs/by-name/xo/xo/package.nix | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/xo/xo/package.nix diff --git a/pkgs/by-name/xo/xo/package.nix b/pkgs/by-name/xo/xo/package.nix new file mode 100644 index 000000000000..c0cf53f2651c --- /dev/null +++ b/pkgs/by-name/xo/xo/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + versionCheckHook, + nix-update-script, +}: +buildGoModule rec { + pname = "xo"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "xo"; + repo = "xo"; + tag = "v${version}"; + hash = "sha256-cmSY+Et2rE+hLZ1+d2Vvwp+CX0hfLz08QKivQQd7SIQ="; + }; + + vendorHash = "sha256-aTjLoP7u2mMF1Ns/Wb9RR0xAqQCZJjjb5UzY2de6yBU="; + + ldflags = [ + "-X main.version=v${version}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd xo \ + --bash <(${emulator} $out/bin/xo completion bash) \ + --fish <(${emulator} $out/bin/xo completion fish) \ + --zsh <(${emulator} $out/bin/xo completion zsh) + '' + ); + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line tool to generate idiomatic Go code for SQL databases supporting PostgreSQL, MySQL, SQLite, Oracle, and Microsoft SQL Server"; + homepage = "https://github.com/xo/xo"; + changelog = "https://github.com/xo/xo/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "xo"; + }; +} From 4fac92529970a3b84659260e32bb5cfc0d0afb04 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 1 Mar 2025 16:03:52 -0500 Subject: [PATCH 10/39] nixos/cloudflare-dyndns: fix missing home error --- nixos/modules/services/networking/cloudflare-dyndns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index e6e9388dd22b..4e2684b39d43 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -92,6 +92,7 @@ in DynamicUser = true; StateDirectory = "cloudflare-dyndns"; EnvironmentFile = cfg.apiTokenFile; + Environment = [ "XDG_CACHE_HOME=%S/cloudflare-dyndns/.cache" ]; ExecStart = let args = From 457a59136e8a524bbd2cfe35fff73c7cfd807198 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 2 Mar 2025 14:52:17 +0800 Subject: [PATCH 11/39] guesswidth: init at 0.4.0 --- pkgs/by-name/gu/guesswidth/package.nix | 61 ++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/gu/guesswidth/package.nix diff --git a/pkgs/by-name/gu/guesswidth/package.nix b/pkgs/by-name/gu/guesswidth/package.nix new file mode 100644 index 000000000000..427880f139c4 --- /dev/null +++ b/pkgs/by-name/gu/guesswidth/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + versionCheckHook, + nix-update-script, +}: +buildGoModule rec { + pname = "guesswidth"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "noborus"; + repo = "guesswidth"; + tag = "v${version}"; + hash = "sha256-afZYegG4q+KmvNP2yy/HGvP4V1mpOUCxRLWLTUHAK0M="; + }; + + vendorHash = "sha256-IGb+fM3ZOlGrLGFSUeUhZ9wDMKOBofDBYByAQlvXY14="; + + ldflags = [ + "-X github.com/noborus/guesswidth.version=v${version}" + "-X github.com/noborus/guesswidth.revision=${src.rev}" + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd guesswidth \ + --bash <(${emulator} $out/bin/guesswidth completion bash) \ + --fish <(${emulator} $out/bin/guesswidth completion fish) \ + --zsh <(${emulator} $out/bin/guesswidth completion zsh) + '' + ); + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Guess the width (fwf) output without delimiters in commands that output to the terminal"; + homepage = "https://github.com/noborus/guesswidth"; + changelog = "https://github.com/noborus/guesswidth/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "guesswidth"; + }; +} From 0b483037f72095d81ce4af2c7d2b91f1e845c7c0 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 18 Feb 2025 20:27:55 +0100 Subject: [PATCH 12/39] nixos/synapse-auto-compressor: init --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../matrix/synapse-auto-compressor.nix | 164 ++++++++++++++++++ 3 files changed, 167 insertions(+) create mode 100644 nixos/modules/services/matrix/synapse-auto-compressor.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 41f1b9cf1ccb..afde8bb08bf4 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -149,6 +149,8 @@ - [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds). +- [synapse-auto-compressor](https://github.com/matrix-org/rust-synapse-compress-state?tab=readme-ov-file#automated-tool-synapse_auto_compressor), a rust-based matrix-synapse state compressor for postgresql. Available as [services.synapse-auto-compressor](#opt-services.synapse-auto-compressor.enable). + - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 19f53a175c2c..853b8b4dca33 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -751,6 +751,7 @@ ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix ./services/matrix/synapse.nix + ./services/matrix/synapse-auto-compressor.nix ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix ./services/misc/ananicy.nix diff --git a/nixos/modules/services/matrix/synapse-auto-compressor.nix b/nixos/modules/services/matrix/synapse-auto-compressor.nix new file mode 100644 index 000000000000..ac749602af6a --- /dev/null +++ b/nixos/modules/services/matrix/synapse-auto-compressor.nix @@ -0,0 +1,164 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: + +let + cfg = config.services.synapse-auto-compressor; + synapseConfig = config.services.matrix-synapse; + postgresEnabled = config.services.postgresql.enable; + synapseUsesPostgresql = synapseConfig.settings.database.name == "psycopg2"; + synapseUsesLocalPostgresql = + let + args = synapseConfig.settings.database.args; + in + synapseUsesPostgresql + && postgresEnabled + && ( + !(args ? host) + || (builtins.elem args.host [ + "localhost" + "127.0.0.1" + "::1" + ]) + ); +in +{ + options = { + services.synapse-auto-compressor = { + enable = lib.mkEnableOption "synapse-auto-compressor"; + package = lib.mkPackageOption pkgs "rust-synapse-state-compress" { }; + postgresUrl = lib.mkOption { + default = + let + args = synapseConfig.settings.database.args; + in + if synapseConfig.enable then + ''postgresql://${args.user}${lib.optionalString (args ? password) (":" + args.password)}@${ + lib.escapeURL (if (args ? host) then args.host else "/run/postgresql") + }${lib.optionalString (args ? port) (":" + args.port)}/${args.database}'' + else + null; + defaultText = lib.literalExpression '' + let + synapseConfig = config.services.matrix-synapse; + args = synapseConfig.settings.database.args; + in + if synapseConfig.enable then + '''postgresql://''${args.user}''${lib.optionalString (args ? password) (":" + args.password)}@''${ + lib.escapeURL (if (args ? host) then args.host else "/run/postgresql") + }''${lib.optionalString (args ? port) (":" + args.port)}''${args.database}''' + else + null; + ''; + type = lib.types.str; + example = "postgresql://username:password@mydomain.com:port/database"; + description = '' + Connection string to postgresql in the + [rust `postgres` crate config format](https://docs.rs/postgres/latest/postgres/config/struct.Config.html). + The module will attempt to build a URL-style connection string out of the `services.matrix-synapse.settings.database.args` + if a local synapse is enabled. + ''; + }; + startAt = lib.mkOption { + default = "weekly"; + type = with lib.types; either str (listOf str); + description = "How often to run this service in systemd calendar syntax (see {manpage}`systemd.time(7)`)"; + example = "daily"; + }; + + settings = { + chunk_size = lib.mkOption { + type = lib.types.int; + default = 500; + description = '' + The number of state groups to work on at once. All of the entries from `state_groups_state` are requested + from the database for state groups that are worked on. Therefore small chunk sizes may be needed on + machines with low memory. + + Note: if the compressor fails to find space savings on the chunk as a whole + (which may well happen in rooms with lots of backfill in) then the entire chunk is skipped. + ''; + }; + chunks_to_compress = lib.mkOption { + type = lib.types.int; + default = 100; + description = '' + `chunks_to_compress` chunks of size `chunk_size` will be compressed. The higher this number is set to, + the longer the compressor will run for. + ''; + }; + levels = lib.mkOption { + type = with lib.types; listOf int; + default = [ + 100 + 50 + 25 + ]; + description = '' + Sizes of each new level in the compression algorithm, as a comma-separated list. The first entry in + the list is for the lowest, most granular level, with each subsequent entry being for the next highest + level. The number of entries in the list determines the number of levels that will be used. The sum of + the sizes of the levels affects the performance of fetching the state from the database, as the sum of + the sizes is the upper bound on the number of iterations needed to fetch a given set of state. + ''; + }; + }; + }; + }; + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = synapseConfig.enable && synapseUsesPostgresql; + message = "`services.synapse-auto-compressor` requires local synapse to use postgresql as a database backend"; + } + ]; + systemd.services.synapse-auto-compressor = { + description = "synapse-auto-compressor"; + requires = lib.optionals synapseUsesLocalPostgresql [ + "postgresql.service" + ]; + inherit (cfg) startAt; + serviceConfig = { + Type = "oneshot"; + DynamicUser = true; + User = "matrix-synapse"; + PrivateTmp = true; + ExecStart = utils.escapeSystemdExecArgs [ + "${cfg.package}/bin/synapse_auto_compressor" + "-p" + cfg.postgresUrl + "-c" + cfg.settings.chunk_size + "-n" + cfg.settings.chunks_to_compress + "-l" + (lib.concatStringsSep "," (builtins.map builtins.toString cfg.settings.levels)) + ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + ProcSubset = "pid"; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + }; + }; + }; +} From a9d9cdbffafe54f23990a58df461b4f2c8afab5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Mar 2025 22:30:03 +0000 Subject: [PATCH 13/39] python312Packages.pytubefix: 8.12.1 -> 8.12.2 --- pkgs/development/python-modules/pytubefix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index c6c654a30c37..9986c26c4902 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "8.12.1"; + version = "8.12.2"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-PZxwF8rAPHmPpw6MKI8OVrl7CRNn9ldPnsPmHlAYahM="; + hash = "sha256-1m7d1eLnoIDrja83sGKBh/u8ryZuw6lb1FEO+XNc03M="; }; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Pytube fork with additional features and fixes"; homepage = "https://github.com/JuanBindez/pytubefix"; - changelog = "https://github.com/JuanBindez/pytubefix/releases/tag/v${version}"; + changelog = "https://github.com/JuanBindez/pytubefix/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ youhaveme9 ]; }; From 26aa4aaf60dee56e4347c3b0376722067d50460c Mon Sep 17 00:00:00 2001 From: huantian Date: Mon, 3 Mar 2025 11:34:55 -0800 Subject: [PATCH 14/39] unityhub: fix unity 6 editor vulkan backend --- pkgs/development/tools/unityhub/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 67b7b2c52f14..d4139e8fcfe7 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { # Unity Editor 6000 specific dependencies harfbuzz + vulkan-loader ] ++ extraLibs pkgs; }; From 0c28c9fee063e2b784c1fba2dd76e2e2e0d57005 Mon Sep 17 00:00:00 2001 From: wattmto Date: Wed, 5 Mar 2025 20:41:02 +0900 Subject: [PATCH 15/39] macskk: Add passthru.updateScript --- pkgs/by-name/ma/macskk/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/macskk/package.nix b/pkgs/by-name/ma/macskk/package.nix index c366d41a76fe..b18ead7eff50 100644 --- a/pkgs/by-name/ma/macskk/package.nix +++ b/pkgs/by-name/ma/macskk/package.nix @@ -6,6 +6,7 @@ cpio, xar, darwin, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -46,6 +47,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Yet Another macOS SKK Input Method"; homepage = "https://github.com/mtgto/macSKK"; From daeba872e72767633c3d315c9d0e7e9556edeeb7 Mon Sep 17 00:00:00 2001 From: wattmto Date: Wed, 5 Mar 2025 11:42:43 +0000 Subject: [PATCH 16/39] macskk: 1.4.1 -> 1.11.0 --- pkgs/by-name/ma/macskk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/macskk/package.nix b/pkgs/by-name/ma/macskk/package.nix index b18ead7eff50..3915199e5769 100644 --- a/pkgs/by-name/ma/macskk/package.nix +++ b/pkgs/by-name/ma/macskk/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "macskk"; - version = "1.4.1"; + version = "1.11.0"; src = fetchurl { url = "https://github.com/mtgto/macSKK/releases/download/${finalAttrs.version}/macSKK-${finalAttrs.version}.dmg"; - hash = "sha256-lLIFVGwt3VDsXRRGczY5VeqUyUgkX+G9tB3SGrO0voM="; + hash = "sha256-CqtW6bfSuAo+9VRmRTgx0aKpBKBEDIxidOh7V5vD7ww="; }; nativeBuildInputs = [ From 69edf950a208e449288522dac342eb25a98885f3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 6 Mar 2025 12:35:48 +0100 Subject: [PATCH 17/39] laurel: 0.6.5 -> 0.7.0 https://github.com/threathunters-io/laurel/releases/tag/v0.7.0 diff: https://github.com/threathunters-io/laurel/compare/v0.6.5...v0.7.0 --- pkgs/servers/monitoring/laurel/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 3db35b40fb4a..6dd83daa56c3 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -3,31 +3,21 @@ fetchFromGitHub, lib, rustPlatform, - fetchpatch2, }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; tag = "v${version}"; - hash = "sha256-1UjIye+btsNtf9Klti/3frgO7M+D05WkC1iP+TPQkZk="; + hash = "sha256-fToxRAcZOZvuuzaaWSjweqEwdUu3K2EKXY0K2Qixqpo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-N5mgd2c/eD0QEUQ4Oe7JI/2yI0B1pawYfc4ZKZAu4Sk="; - - patches = [ - # https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e - # Unbreaks the userdb::test::userdb test. Will be part of the next release (likely v0.6.6). - (fetchpatch2 { - url = "https://github.com/threathunters-io/laurel/commit/d2fc51c83e78aecd5c4ce922582df649c2600e1e.patch?full_index=1"; - hash = "sha256-OId5ZCF71ikoCSggyy3u4USR71onFJpirp53k4M17Vo="; - }) - ]; + cargoHash = "sha256-i5wsS7y65sIvICfgViVIAbQU9f1E0EmspX+YVKDSKOU="; postPatch = '' # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc From 1e9e18d004efa2a44fd75f25491ed9c3ebc52e0b Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 6 Mar 2025 10:26:42 -0300 Subject: [PATCH 18/39] pmbootstrap: 3.2.0 -> 3.3.1 Signed-off-by: lucasew --- pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 7a9ed331c49c..602c583942dc 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.2.0"; + version = "3.3.1"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = pname; tag = version; - hash = "sha256-iJ3XK1aA3d0V5ATj2h6arHlTRKocmJ1AaySiq9bSJrs="; + hash = "sha256-2xeUuaxHS2mHuBN3EWGNZwn4S6aRmF6cUQI4LWeXLkE="; domain = "gitlab.postmarketos.org"; }; From 17fc9b9d6c379146adfdd49f9d088e5ac405b619 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 6 Mar 2025 10:29:02 -0300 Subject: [PATCH 19/39] pmbootstrap: disable test that would reach the Internet Signed-off-by: lucasew --- pkgs/by-name/pm/pmbootstrap/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 602c583942dc..b8e20a96327f 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { # skip impure tests disabledTests = [ "test_pkgrepo_pmaports" + "test_random_valid_deviceinfos" ]; versionCheckProgramArg = "--version"; From 4899e1306a941413a22de652bec9871bec1953ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Mar 2025 19:11:55 +0000 Subject: [PATCH 20/39] elementary-xfce-icon-theme: 0.20.1 -> 0.21 --- pkgs/by-name/el/elementary-xfce-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix index 5d87e72aa9c2..d798058ac647 100644 --- a/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix +++ b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.20.1"; + version = "0.21"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - hash = "sha256-4Q3e6w0XqtsXZVnlHNf84CFO6ITwqlgB69D7iqJ2YO8="; + hash = "sha256-ncPL76HCC9n4wTciGeqb+YAUcCE9EeOpWGM5DRYUCYg="; }; nativeBuildInputs = [ From b7c288a8cb12473af08253a9c1ba31f5eb87fb79 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 7 Mar 2025 02:12:18 +0800 Subject: [PATCH 21/39] librewolf-bin-unwrapped: init at 136.0-2 --- .../li/librewolf-bin-unwrapped/package.nix | 117 ++++++++++++++++++ .../li/librewolf-bin-unwrapped/update.sh | 24 ++++ 2 files changed, 141 insertions(+) create mode 100644 pkgs/by-name/li/librewolf-bin-unwrapped/package.nix create mode 100755 pkgs/by-name/li/librewolf-bin-unwrapped/update.sh diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix new file mode 100644 index 000000000000..1c5f9ea3a98a --- /dev/null +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + fetchurl, + config, + wrapGAppsHook3, + autoPatchelfHook, + alsa-lib, + curl, + dbus-glib, + gtk3, + libXtst, + libva, + pciutils, + pipewire, + adwaita-icon-theme, + writeText, + patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections +}: + +let + binaryName = "librewolf"; + + mozillaPlatforms = { + i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; + aarch64-linux = "linux-arm64"; + }; + + throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; + + arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem; + + policies = config.librewolf.policies or { }; + + policiesJson = writeText "librewolf-policies.json" (builtins.toJSON { inherit policies; }); + + pname = "librewolf-bin-unwrapped"; + + version = "136.0-2"; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; + hash = + { + i686-linux = "sha256-VRY6OY3nBTfwrdoRF8zBjSfwrxCM9SnmjUvAXhLbGSY="; + x86_64-linux = "sha256-KjOES7AjoObZ0EPjTFAVafm++8MsxtEs1FgViLsR/hc="; + aarch64-linux = "sha256-vUW+eEabJ3Gp0ov/9ms/KyLzwHOCKozpR/CdZGaxA0I="; + } + .${stdenv.hostPlatform.system} or throwSystem; + }; + + nativeBuildInputs = [ + wrapGAppsHook3 + autoPatchelfHook + patchelfUnstable + ]; + + buildInputs = [ + gtk3 + adwaita-icon-theme + alsa-lib + dbus-glib + libXtst + ]; + + runtimeDependencies = [ + curl + libva.out + pciutils + ]; + + appendRunpaths = [ "${pipewire}/lib" ]; + + # Firefox uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $prefix/lib $out/bin + cp -r . $prefix/lib/librewolf-bin-${version} + ln -s $prefix/lib/librewolf-bin-${version}/librewolf $out/bin/${binaryName} + # See: https://github.com/mozilla/policy-templates/blob/master/README.md + mv $out/lib/librewolf-bin-${version}/distribution/policies.json $out/lib/librewolf-bin-${version}/distribution/extra-policies.json + ${lib.optionalString (config.librewolf.policies or false) '' + ln -s ${policiesJson} $out/lib/librewolf-bin-${version}/distribution/policies.json + ''} + + runHook postInstall + ''; + + passthru = { + inherit binaryName; + applicationName = "LibreWolf"; + libName = "librewolf-bin-${version}"; + ffmpegSupport = true; + gssSupport = true; + gtk3 = gtk3; + updateScript = ./update.sh; + }; + + meta = { + description = "Fork of Firefox, focused on privacy, security and freedom (upstream binary release)"; + homepage = "https://librewolf.net"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dwrege ]; + platforms = builtins.attrNames mozillaPlatforms; + mainProgram = "librewolf"; + hydraPlatforms = [ ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh b/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh new file mode 100755 index 000000000000..93f8e0fe14b9 --- /dev/null +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts + +set -eou pipefail + +latestVersion=$(curl ${PRIVATE-TOKEN:+-u ":$PRIVATE-TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/releases | jq -r '.[0].tag_name') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; librewolf-bin-unwrapped.version or (lib.getVersion librewolf-bin-unwrapped)" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for i in \ + "i686-linux linux-i686" \ + "x86_64-linux linux-x86_64" \ + "aarch64-linux linux-arm64"; do + set -- $i + hash=$(nix hash convert --to sri --hash-algo sha256 $(curl ${PRIVATE-TOKEN:+-u ":$PRIVATE-TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum)) + update-source-version librewolf-bin-unwrapped $latestVersion $hash --system=$1 --ignore-same-version +done From 63d1a7b7331d3ef5a6d4a4baeeabc96cc8903948 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Mar 2025 11:03:39 +0000 Subject: [PATCH 22/39] woodpecker-plugin-git: 2.6.1 -> 2.6.2 --- pkgs/by-name/wo/woodpecker-plugin-git/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix index db92b64dca1f..9fde5ba1dfd8 100644 --- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix +++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; tag = version; - hash = "sha256-xE5wLW7u5fh+xk/D2Y+Fcx5eTiZX0pJYHKncWVwHDlQ="; + hash = "sha256-5YyYCdZpRlchLH4qX9golv8DmlMghosWi5WXP9WxMXU="; }; vendorHash = "sha256-XOriHt+qyOcuGZzMtGAZuztxLod92JzjKWWjNq5Giro="; From 567191baaaf36ff8764dc657d43f44de430b7107 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Mar 2025 14:03:57 +0100 Subject: [PATCH 23/39] slurm: 24.11.2.1 -> 24.11.3.1 --- pkgs/by-name/sl/slurm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index faedabdd38aa..a75e4751c22b 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "24.11.2.1"; + version = "24.11.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-MsV/1fPEWMociQfpPQjmyQIXXo9oDtkgIKUlgEG3zHY="; + hash = "sha256-DdGCPNmLCp1SgsYPVr7Gr4yqBrV2Ot3nJsWpcuYty5U="; }; outputs = [ From 7c3e84849ccdcd537ed1f5a59fac745163f1ccf5 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:31:32 +0000 Subject: [PATCH 24/39] librewolf-bin: use librewolf-bin-unwrapped --- pkgs/by-name/li/librewolf-bin/package.nix | 35 ----------------------- pkgs/top-level/all-packages.nix | 10 +++++++ 2 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 pkgs/by-name/li/librewolf-bin/package.nix diff --git a/pkgs/by-name/li/librewolf-bin/package.nix b/pkgs/by-name/li/librewolf-bin/package.nix deleted file mode 100644 index 7d3a23cd489b..000000000000 --- a/pkgs/by-name/li/librewolf-bin/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: - -let - pname = "librewolf-bin"; - upstreamVersion = "135.0-1"; - version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion; - src = fetchurl { - url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage"; - hash = "sha256-Qg4hc3bpJh3NFMUlq65K1fVtp6Slgtk2OjvcELp4aH8="; - }; - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/{${pname},librewolf} - install -Dm444 ${appimageContents}/io.gitlab.LibreWolf.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/librewolf.png -t $out/share/pixmaps - ''; - - meta = { - description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)"; - homepage = "https://librewolf.net"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dwrege ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "librewolf"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dc3848b4a9f..803ea76b6e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13429,6 +13429,16 @@ with pkgs; libName = "librewolf"; }; + librewolf-bin = wrapFirefox librewolf-bin-unwrapped { + pname = "librewolf-bin"; + extraPrefsFiles = [ + "${librewolf-bin-unwrapped}/lib/librewolf-bin-${librewolf-bin-unwrapped.version}/librewolf.cfg" + ]; + extraPoliciesFiles = [ + "${librewolf-bin-unwrapped}/lib/librewolf-bin-${librewolf-bin-unwrapped.version}/distribution/extra-policies.json" + ]; + }; + firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; floorp-unwrapped = import ../applications/networking/browsers/floorp { From ea79d17e5bfed8408bcf0a3639418904e3ea386d Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 7 Mar 2025 16:11:53 +0100 Subject: [PATCH 25/39] nixos/nextcloud: update nextcloud version in example --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 1943e06804a6..5ac7cd2faea7 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -309,7 +309,7 @@ in { ''; example = literalExpression '' { - inherit (pkgs.nextcloud25Packages.apps) mail calendar contact; + inherit (pkgs.nextcloud31Packages.apps) mail calendar contact; phonetrack = pkgs.fetchNextcloudApp { name = "phonetrack"; sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc"; From 1389fff391809d4bd183cd182024ca2e89d50c1b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 8 Mar 2025 03:58:41 +0400 Subject: [PATCH 26/39] lib60870: fix darwin build --- pkgs/by-name/li/lib60870/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 2c9966ab1ac7..1884f873a1e1 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/lib60870-C"; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/CMakeLists.txt --replace-warn "-lrt" "" + ''; + separateDebugInfo = true; nativeBuildInputs = [ cmake ]; From fad6249846fb9f45c281d8a27fab89c2ae9633e9 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 7 Mar 2025 20:57:44 -0500 Subject: [PATCH 27/39] anup: move to by-name Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/an/anup/Cargo.lock | 1179 +++++++++++++++++ .../an/anup/package.nix} | 4 - pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1179 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/an/anup/Cargo.lock rename pkgs/{applications/misc/anup/default.nix => by-name/an/anup/package.nix} (90%) diff --git a/pkgs/by-name/an/anup/Cargo.lock b/pkgs/by-name/an/anup/Cargo.lock new file mode 100644 index 000000000000..2482edcce7a1 --- /dev/null +++ b/pkgs/by-name/an/anup/Cargo.lock @@ -0,0 +1,1179 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "anime" +version = "0.1.0" +dependencies = [ + "attohttpc", + "base64 0.13.0", + "chrono", + "diesel", + "enum_dispatch", + "nom", + "serde", + "serde_derive", + "serde_json", + "smallvec", + "strsim", + "thiserror", +] + +[[package]] +name = "anup" +version = "0.4.0" +dependencies = [ + "anime", + "anyhow", + "argh", + "bincode", + "bitflags", + "chrono", + "crossterm 0.19.0", + "diesel", + "dirs-next", + "futures", + "once_cell", + "parking_lot", + "pico-args", + "ron", + "serde", + "serde_derive", + "smallvec", + "strsim", + "thiserror", + "tokio", + "tui", + "tui-utils", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "anyhow" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" + +[[package]] +name = "argh" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91792f088f87cdc7a2cfb1d617fa5ea18d7f1dc22ef0e1b5f82f3157cdc522be" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4eb0c0c120ad477412dc95a4ce31e38f2113e46bd13511253f79196ca68b067" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781f336cc9826dbaddb9754cb5db61e64cab4f69668bd19dcc4a0394a86f4cb1" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "attohttpc" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" +dependencies = [ + "http", + "log", + "rustls", + "serde", + "serde_json", + "url", + "webpki", + "webpki-roots", + "wildmatch", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "base64" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bincode" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" +dependencies = [ + "byteorder", + "serde", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bumpalo" +version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" + +[[package]] +name = "byteorder" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb" +dependencies = [ + "bitflags", + "crossterm_winapi 0.6.2", + "lazy_static", + "libc", + "mio", + "parking_lot", + "signal-hook", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" +dependencies = [ + "bitflags", + "crossterm_winapi 0.7.0", + "futures-core", + "lazy_static", + "libc", + "mio", + "parking_lot", + "serde", + "signal-hook", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" +dependencies = [ + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" +dependencies = [ + "winapi", +] + +[[package]] +name = "diesel" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" +dependencies = [ + "byteorder", + "diesel_derives", + "libsqlite3-sys", +] + +[[package]] +name = "diesel_derives" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" + +[[package]] +name = "futures-executor" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" + +[[package]] +name = "futures-macro" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" + +[[package]] +name = "futures-task" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" + +[[package]] +name = "futures-util" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "http" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "idna" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "js-sys" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" + +[[package]] +name = "libsqlite3-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "lock_api" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "mio" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +dependencies = [ + "socket2", + "winapi", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pico-args" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70072c20945e1ab871c472a285fc772aefd4f5407723c206242f2c6f94595d6" + +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "redox_syscall" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom", + "redox_syscall", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "ron" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f" +dependencies = [ + "base64 0.13.0", + "bitflags", + "serde", +] + +[[package]] +name = "rustls" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +dependencies = [ + "base64 0.12.3", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "serde" +version = "1.0.124" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.124" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "signal-hook" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +dependencies = [ + "libc", + "mio", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if", + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "tinyvec" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "once_cell", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "winapi", +] + +[[package]] +name = "tui" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9" +dependencies = [ + "bitflags", + "cassowary", + "crossterm 0.18.2", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "tui-utils" +version = "0.10.0" +source = "git+https://github.com/Acizza/tui-utils?rev=0.10.0#109a7f264b0c160799552d209fffaee0c3f1c703" +dependencies = [ + "smallvec", + "tui", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ + "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "vcpkg" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasm-bindgen" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" + +[[package]] +name = "web-sys" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +dependencies = [ + "webpki", +] + +[[package]] +name = "wildmatch" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/by-name/an/anup/package.nix similarity index 90% rename from pkgs/applications/misc/anup/default.nix rename to pkgs/by-name/an/anup/package.nix index ef343f346146..dab246a9077d 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/by-name/an/anup/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - Security, sqlite, xdg-utils, }: @@ -23,9 +22,6 @@ rustPlatform.buildRustPackage rec { [ sqlite xdg-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security ]; cargoLock = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b21c52cddd7f..ddc11d2267f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12821,10 +12821,6 @@ with pkgs; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; - anup = callPackage ../applications/misc/anup { - inherit (darwin.apple_sdk.frameworks) Security; - }; - apkeep = callPackage ../tools/misc/apkeep { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From f0a6082d2b88ff1906a6b43ff9119b8468b4b9b6 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 7 Mar 2025 21:13:04 -0500 Subject: [PATCH 28/39] anup: use useFetchCargoVendor and rm Cargo.lock Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/an/anup/Cargo.lock | 1179 ------------------------------ pkgs/by-name/an/anup/package.nix | 20 +- 2 files changed, 8 insertions(+), 1191 deletions(-) delete mode 100644 pkgs/by-name/an/anup/Cargo.lock diff --git a/pkgs/by-name/an/anup/Cargo.lock b/pkgs/by-name/an/anup/Cargo.lock deleted file mode 100644 index 2482edcce7a1..000000000000 --- a/pkgs/by-name/an/anup/Cargo.lock +++ /dev/null @@ -1,1179 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "anime" -version = "0.1.0" -dependencies = [ - "attohttpc", - "base64 0.13.0", - "chrono", - "diesel", - "enum_dispatch", - "nom", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "strsim", - "thiserror", -] - -[[package]] -name = "anup" -version = "0.4.0" -dependencies = [ - "anime", - "anyhow", - "argh", - "bincode", - "bitflags", - "chrono", - "crossterm 0.19.0", - "diesel", - "dirs-next", - "futures", - "once_cell", - "parking_lot", - "pico-args", - "ron", - "serde", - "serde_derive", - "smallvec", - "strsim", - "thiserror", - "tokio", - "tui", - "tui-utils", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "anyhow" -version = "1.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" - -[[package]] -name = "argh" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91792f088f87cdc7a2cfb1d617fa5ea18d7f1dc22ef0e1b5f82f3157cdc522be" -dependencies = [ - "argh_derive", - "argh_shared", -] - -[[package]] -name = "argh_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4eb0c0c120ad477412dc95a4ce31e38f2113e46bd13511253f79196ca68b067" -dependencies = [ - "argh_shared", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "argh_shared" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781f336cc9826dbaddb9754cb5db61e64cab4f69668bd19dcc4a0394a86f4cb1" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "attohttpc" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" -dependencies = [ - "http", - "log", - "rustls", - "serde", - "serde_json", - "url", - "webpki", - "webpki-roots", - "wildmatch", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bincode" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" -dependencies = [ - "byteorder", - "serde", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bumpalo" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cc" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb" -dependencies = [ - "bitflags", - "crossterm_winapi 0.6.2", - "lazy_static", - "libc", - "mio", - "parking_lot", - "signal-hook", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" -dependencies = [ - "bitflags", - "crossterm_winapi 0.7.0", - "futures-core", - "lazy_static", - "libc", - "mio", - "parking_lot", - "serde", - "signal-hook", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" -dependencies = [ - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" -dependencies = [ - "winapi", -] - -[[package]] -name = "diesel" -version = "1.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" -dependencies = [ - "byteorder", - "diesel_derives", - "libsqlite3-sys", -] - -[[package]] -name = "diesel_derives" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - -[[package]] -name = "futures" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" - -[[package]] -name = "futures-executor" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" - -[[package]] -name = "futures-macro" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" - -[[package]] -name = "futures-task" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" - -[[package]] -name = "futures-util" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "proc-macro-hack", - "proc-macro-nested", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "http" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "js-sys" -version = "0.3.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical-core" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae" - -[[package]] -name = "libsqlite3-sys" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" -dependencies = [ - "pkg-config", - "vcpkg", -] - -[[package]] -name = "lock_api" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" - -[[package]] -name = "mio" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" -dependencies = [ - "socket2", - "winapi", -] - -[[package]] -name = "nom" -version = "6.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pico-args" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70072c20945e1ab871c472a285fc772aefd4f5407723c206242f2c6f94595d6" - -[[package]] -name = "pin-project-lite" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - -[[package]] -name = "redox_syscall" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom", - "redox_syscall", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ron" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f" -dependencies = [ - "base64 0.13.0", - "bitflags", - "serde", -] - -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "serde" -version = "1.0.124" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.124" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "signal-hook" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "mio", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if", - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "thiserror" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "tinyvec" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "once_cell", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "winapi", -] - -[[package]] -name = "tui" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9" -dependencies = [ - "bitflags", - "cassowary", - "crossterm 0.18.2", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "tui-utils" -version = "0.10.0" -source = "git+https://github.com/Acizza/tui-utils?rev=0.10.0#109a7f264b0c160799552d209fffaee0c3f1c703" -dependencies = [ - "smallvec", - "tui", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasm-bindgen" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" - -[[package]] -name = "web-sys" -version = "0.3.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" -dependencies = [ - "webpki", -] - -[[package]] -name = "wildmatch" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/by-name/an/anup/package.nix b/pkgs/by-name/an/anup/package.nix index dab246a9077d..8aa85f3f8a07 100644 --- a/pkgs/by-name/an/anup/package.nix +++ b/pkgs/by-name/an/anup/package.nix @@ -14,28 +14,24 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Acizza"; repo = "anup"; - rev = version; - sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; + tag = version; + hash = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; }; + useFetchCargoVendor = true; + cargoHash = "sha256-925R5pG514JiA7iUegFkxrDpA3o7T/Ct4Igqqcdo3rw="; + buildInputs = [ sqlite xdg-utils ]; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tui-utils-0.10.0" = "sha256-xazeXTGiMFZEcSFEF26te3LQ5oFFcskIiYkLzfsXf/A="; - }; - }; - - meta = with lib; { + meta = { homepage = "https://github.com/Acizza/anup"; description = "Anime tracker for AniList featuring a TUI"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ natto1784 ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ natto1784 ]; mainProgram = "anup"; }; } From 75778658c0f01714505588216223457dcd83762a Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 7 Mar 2025 21:23:44 -0500 Subject: [PATCH 29/39] anup: run nixfmt-rfc-style Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/an/anup/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/an/anup/package.nix b/pkgs/by-name/an/anup/package.nix index 8aa85f3f8a07..c40278653f65 100644 --- a/pkgs/by-name/an/anup/package.nix +++ b/pkgs/by-name/an/anup/package.nix @@ -21,11 +21,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-925R5pG514JiA7iUegFkxrDpA3o7T/Ct4Igqqcdo3rw="; - buildInputs = - [ - sqlite - xdg-utils - ]; + buildInputs = [ + sqlite + xdg-utils + ]; meta = { homepage = "https://github.com/Acizza/anup"; From 0605b0270e82a68249a7020aad2c1bc8e4343082 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 8 Mar 2025 07:03:26 +0000 Subject: [PATCH 30/39] mold: 2.37.0 -> 2.37.1 Changes: https://github.com/rui314/mold/releases/tag/v2.37.1 --- pkgs/by-name/mo/mold/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 8ae3b9a4c67e..8d0feca3bacd 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.37.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-Be5czR6ODN4NnJ0f3NYP2shLbawJHU/EU2aHqTBRKzE="; + hash = "sha256-ZGO3oT8NOOkAYTyoMUKxH3TFP4mw2z0BGdGSF2TbKaE="; }; nativeBuildInputs = [ From 18e84362b63808822ff4069465857449fd7a1efd Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 8 Mar 2025 17:49:15 +0700 Subject: [PATCH 31/39] mkBinaryCache: add missing .nar extension Flagged in https://github.com/NixOS/nixpkgs/pull/376365#discussion_r1976613767. This now properly restores the .nar extension. --- pkgs/build-support/binary-cache/make-binary-cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/binary-cache/make-binary-cache.py b/pkgs/build-support/binary-cache/make-binary-cache.py index 8b774cf65adb..9104d64a46d0 100644 --- a/pkgs/build-support/binary-cache/make-binary-cache.py +++ b/pkgs/build-support/binary-cache/make-binary-cache.py @@ -16,7 +16,7 @@ def processItem( ): narInfoHash = dropPrefix(item["path"], nixPrefix).split("-")[0] - narFile = outDir / "nar" / f"{narInfoHash}{compressionExtension}" + narFile = outDir / "nar" / f"{narInfoHash}.nar{compressionExtension}" with open(narFile, "wb") as f: subprocess.run( f"nix-store --dump {item['path']} {compressionCommand}", @@ -36,7 +36,7 @@ def processItem( ) fileSize = os.path.getsize(narFile) - finalNarFileName = Path("nar") / f"{fileHash}{compressionExtension}" + finalNarFileName = Path("nar") / f"{fileHash}.nar{compressionExtension}" os.rename(narFile, outDir / finalNarFileName) with open(outDir / f"{narInfoHash}.narinfo", "wt") as f: From a65889ad2a95190bdf8943652d4063984cfd2477 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 12:04:58 +0000 Subject: [PATCH 32/39] justbuild: 1.4.3 -> 1.5.0 --- pkgs/by-name/ju/justbuild/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 4c912509619c..e62ef9140ef4 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; rev = "refs/tags/v${version}"; - hash = "sha256-Hx+MU1W/vwN+hlAAbIieBAmHUw65AGZ10ItBdIG+IEM="; + hash = "sha256-HewKW2yezsc7mYZ6r3c0w/M3ybPzXqLPUL8N+plqE8o="; }; bazelapi = fetchurl { From 4e0fb12e27922ce65b5d2e4cbf1912f72dafd98f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 12:18:35 +0000 Subject: [PATCH 33/39] jawiki-all-titles-in-ns0: 0-unstable-2025-02-01 -> 0-unstable-2025-03-01 --- pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index 5b397213e61a..ad02c7f3258c 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2025-02-01"; + version = "0-unstable-2025-03-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "6cc3e7af84f3809f95bd4340847de3fabccb0a8c"; - hash = "sha256-nd329TNBABpRb+Z2eMUzNwTToMIDM/2Zt47NYfKyXe0="; + rev = "e8e2b841c48b4475cc2ae99c4635ea140aa630d6"; + hash = "sha256-TJMOjayu9lWxg6j9HurXbxGc9RrCb/arXkVSezR2kgc="; }; installPhase = '' From d57ea7fe181f09f76fa5e0ce988257888297369c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 12:36:49 +0000 Subject: [PATCH 34/39] jp-zip-codes: 0-unstable-2025-02-01 -> 0-unstable-2025-03-01 --- pkgs/by-name/jp/jp-zip-codes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix index ec43031235eb..c36c53af3f71 100644 --- a/pkgs/by-name/jp/jp-zip-codes/package.nix +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -7,15 +7,15 @@ stdenvNoCC.mkDerivation { pname = "jp-zip-code"; - version = "0-unstable-2025-02-01"; + version = "0-unstable-2025-03-01"; # This package uses a mirror as the source because the # original provider uses the same URL for updated content. src = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "2fdcd4f4c00a90de1dacfe16644bbaadbfd377aa"; - hash = "sha256-i81TzPrhHE3wZdq/HJGnTsvmo/clWCYO74hJf9hMxs4="; + rev = "82ea5a76dfaf43da8b838f20827ea535e37bd44c"; + hash = "sha256-DhQlbYgy+p1FZ2a/PxbauQ4UGR83Q64A2a3bn/yWD6Y="; }; installPhase = '' From f6d17c2d8747c90d66454baae36316c045fd35a5 Mon Sep 17 00:00:00 2001 From: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com> Date: Sat, 8 Mar 2025 15:58:25 +0300 Subject: [PATCH 35/39] CONTRIBUTING: fix a small typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 655e57df2829..0f14915b6b50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -650,7 +650,7 @@ If you want your PR to get merged quickly and smoothly, it is in your best inter For the committer to judge your intention, it's best to explain why you've made your change. This does not apply to trivial changes like version updates because the intention is obvious (though linking the changelog is appreciated). -For any more nuanced changed or even major version upgrades, it helps if you explain the background behind your change a bit. +For any more nuanced changes or even major version upgrades, it helps if you explain the background behind your change a bit. E.g. if you're adding a package, explain what it is and why it should be in Nixpkgs. This goes hand in hand with [Writing good commit messages](#writing-good-commit-messages). From 329a253d1aa17f981cec48ba5b5f8f093c5701f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Mar 2025 13:51:35 +0000 Subject: [PATCH 36/39] python312Packages.fastembed: 0.5.1 -> 0.6.0 --- pkgs/development/python-modules/fastembed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 9a16fb135e9c..5e29d425cd92 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "qdrant"; repo = "fastembed"; tag = "v${version}"; - hash = "sha256-aVeQC0BooVZcbIplVRzY22ozliWW/Ts/asiInTxSBOE="; + hash = "sha256-mZClZuSTTGQQSH6KYLcVx0YaNoAwRO25eRxGGjOz8B8="; }; build-system = [ poetry-core ]; @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Fast, Accurate, Lightweight Python library to make State of the Art Embedding"; homepage = "https://github.com/qdrant/fastembed"; - changelog = "https://github.com/qdrant/fastembed/releases/tag/v${version}"; + changelog = "https://github.com/qdrant/fastembed/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' From 16d30c563d4f26ba2e4c22e3ecf56b60b05ba0c2 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Mar 2025 17:36:50 +0100 Subject: [PATCH 37/39] treewide: replace references to SDL.dev with lib.getDev SDL --- pkgs/by-name/fi/fish-fillets-ng/package.nix | 2 +- pkgs/by-name/fr/freedroidrpg/package.nix | 2 +- pkgs/by-name/gl/gltron/package.nix | 2 +- pkgs/by-name/hh/hheretic/package.nix | 2 +- pkgs/by-name/hh/hhexen/package.nix | 2 +- pkgs/by-name/sd/SDL_gfx/package.nix | 2 +- pkgs/by-name/sd/SDL_mixer/package.nix | 2 +- pkgs/by-name/sd/SDL_sound/package.nix | 2 +- pkgs/by-name/sd/SDL_ttf/package.nix | 2 +- pkgs/by-name/sp/sparrow3d/package.nix | 2 +- pkgs/development/python-modules/wxpython/4.2.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fi/fish-fillets-ng/package.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix index 73011c6bafd3..7c40b658cbfd 100644 --- a/pkgs/by-name/fi/fish-fillets-ng/package.nix +++ b/pkgs/by-name/fi/fish-fillets-ng/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; # pass in correct sdl-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 021abb8c7e9b..d6cdcf46ee3f 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { zlib ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; enableParallelBuilding = true; diff --git a/pkgs/by-name/gl/gltron/package.nix b/pkgs/by-name/gl/gltron/package.nix index 1ceebc33f76a..4fe74f8b68b1 100644 --- a/pkgs/by-name/gl/gltron/package.nix +++ b/pkgs/by-name/gl/gltron/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; buildInputs = [ SDL diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index c2d7a7909ff1..64a3fa9d82ac 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - SDL.dev + (lib.getDev SDL) ]; buildInputs = [ diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix index 4d3601cf43f5..4d994f472128 100644 --- a/pkgs/by-name/hh/hhexen/package.nix +++ b/pkgs/by-name/hh/hhexen/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - SDL.dev + (lib.getDev SDL) ]; buildInputs = [ diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index 65711ff5e396..9b0b74963626 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h propagatedBuildInputs = [ SDL ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; configureFlags = [ (lib.enableFeature false "mmx") diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index bedfda42842a..9a871a71f4ec 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # pass in correct *-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; configureFlags = [ diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix index 189a2ac4f67f..1ed4ecd400aa 100644 --- a/pkgs/by-name/sd/SDL_sound/package.nix +++ b/pkgs/by-name/sd/SDL_sound/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature enableSdltest "sdltest") ]; - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; strictDeps = true; diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index 64fc256db640..64c2137d25e2 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # pass in correct *-config for cross builds - env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config"; configureFlags = [ diff --git a/pkgs/by-name/sp/sparrow3d/package.nix b/pkgs/by-name/sp/sparrow3d/package.nix index 6a430bff6fe6..393781481639 100644 --- a/pkgs/by-name/sp/sparrow3d/package.nix +++ b/pkgs/by-name/sp/sparrow3d/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - SDL.dev + (lib.getDev SDL) SDL_image SDL_ttf SDL_mixer diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 6a5d3debaf40..b8c537ce0d71 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -108,7 +108,7 @@ buildPythonPackage rec { export DOXYGEN=${doxygen}/bin/doxygen export PATH="${wxGTK}/bin:$PATH" - export SDL_CONFIG="${SDL.dev}/bin/sdl-config" + export SDL_CONFIG="${lib.getExe' (lib.getDev SDL) "sdl-config"}" export WAF=$PWD/bin/waf ${python.pythonOnBuildForHost.interpreter} build.py -v --use_syswx dox etg sip --nodoc build_py From dc0dc0313068d88e4f66e4fb26c3ee54a05ecf97 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sun, 9 Mar 2025 01:07:31 +0800 Subject: [PATCH 38/39] python3Packages.litellm: add missing optional dependencies for proxy --- pkgs/development/python-modules/litellm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index c31f4db74297..46f3538a6912 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -8,6 +8,7 @@ buildPythonPackage, click, cryptography, + email-validator, fastapi, fastapi-sso, fetchFromGitHub, @@ -32,6 +33,7 @@ rq, tiktoken, tokenizers, + uvloop, uvicorn, }: @@ -56,6 +58,7 @@ buildPythonPackage rec { dependencies = [ aiohttp click + email-validator importlib-metadata jinja2 jsonschema @@ -80,6 +83,7 @@ buildPythonPackage rec { python-multipart pyyaml rq + uvloop uvicorn ]; extra_proxy = [ From 9b5f94b51f5ae9b64db014fe624c5240dffd57a5 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Mar 2025 18:11:11 +0100 Subject: [PATCH 39/39] treewide: replace references to SDL2.dev with lib.getDev and lib.getInclude --- pkgs/by-name/ca/cadzinho/package.nix | 2 +- pkgs/by-name/ke/keeperrl/package.nix | 2 +- pkgs/by-name/li/libwtk-sdl2/package.nix | 2 +- pkgs/by-name/pi/picoloop/package.nix | 4 ++-- pkgs/by-name/qu/quake3e/package.nix | 2 +- pkgs/by-name/re/recastnavigation/package.nix | 2 +- pkgs/by-name/re/renpy/package.nix | 2 +- pkgs/by-name/sd/sdlpop/package.nix | 2 +- pkgs/by-name/sm/smpeg2/package.nix | 2 +- pkgs/by-name/sr/srb2/package.nix | 2 +- pkgs/by-name/ta/tamatool/package.nix | 2 +- pkgs/by-name/to/tome4/package.nix | 2 +- pkgs/by-name/tr/trigger/package.nix | 2 +- pkgs/development/python-modules/pygame-ce/default.nix | 2 +- pkgs/games/bugdom/default.nix | 2 +- pkgs/games/iortcw/sp.nix | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix index 56c333fb6cae..4c20b1e545e0 100644 --- a/pkgs/by-name/ca/cadzinho/package.nix +++ b/pkgs/by-name/ca/cadzinho/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ( [ - "-I${SDL2.dev}/include/SDL2" + "-I${lib.getInclude SDL2}/include/SDL2" "-I${SDL2_net.dev}/include/SDL2" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ke/keeperrl/package.nix b/pkgs/by-name/ke/keeperrl/package.nix index 7bb649924ca3..ea8c74e92d14 100644 --- a/pkgs/by-name/ke/keeperrl/package.nix +++ b/pkgs/by-name/ke/keeperrl/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { ]; env.NIX_CFLAGS_COMPILE = toString [ - "-I${SDL2.dev}/include/SDL2" + "-I${lib.getInclude SDL2}/include/SDL2" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libwtk-sdl2/package.nix b/pkgs/by-name/li/libwtk-sdl2/package.nix index 6415480e135f..2cc178d921fb 100644 --- a/pkgs/by-name/li/libwtk-sdl2/package.nix +++ b/pkgs/by-name/li/libwtk-sdl2/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image ]; # From some reason, this is needed as otherwise SDL.h is not found - NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; + NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2"; outputs = [ "out" diff --git a/pkgs/by-name/pi/picoloop/package.nix b/pkgs/by-name/pi/picoloop/package.nix index 64165d9d06c4..2ea5d75e0b0a 100644 --- a/pkgs/by-name/pi/picoloop/package.nix +++ b/pkgs/by-name/pi/picoloop/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio SDL2 - SDL2.dev + (lib.getDev SDL2) SDL2_image SDL2_ttf alsa-lib @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${SDL2.dev}/include/SDL2" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude SDL2}/include/SDL2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/qu/quake3e/package.nix b/pkgs/by-name/qu/quake3e/package.nix index d4d18a33b833..4bd6d9508ee7 100644 --- a/pkgs/by-name/qu/quake3e/package.nix +++ b/pkgs/by-name/qu/quake3e/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { SDL2 glibc ]; - env.NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2"; enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/by-name/re/recastnavigation/package.nix b/pkgs/by-name/re/recastnavigation/package.nix index ef5f55978adf..eb291fdc1396 100644 --- a/pkgs/by-name/re/recastnavigation/package.nix +++ b/pkgs/by-name/re/recastnavigation/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Expects SDL2.framework in specific location, which we don't have # Change where SDL2 headers are searched for to match what we do have substituteInPlace RecastDemo/CMakeLists.txt \ - --replace 'include_directories(''${SDL2_LIBRARY}/Headers)' 'include_directories(${SDL2.dev}/include/SDL2)' + --replace 'include_directories(''${SDL2_LIBRARY}/Headers)' 'include_directories(${lib.getInclude SDL2}/include/SDL2)' ''; doCheck = true; diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix index 2696c6359f12..a5c0aa7ea091 100644 --- a/pkgs/by-name/re/renpy/package.nix +++ b/pkgs/by-name/re/renpy/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libGLU libpng SDL2 - SDL2.dev + (lib.getDev SDL2) zlib ]; diff --git a/pkgs/by-name/sd/sdlpop/package.nix b/pkgs/by-name/sd/sdlpop/package.nix index e79cf801c28d..42a29210c93e 100644 --- a/pkgs/by-name/sd/sdlpop/package.nix +++ b/pkgs/by-name/sd/sdlpop/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace src/Makefile \ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ - --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2" + --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2" ''; # The prince binary expects two things of the working directory it is called from: diff --git a/pkgs/by-name/sm/smpeg2/package.nix b/pkgs/by-name/sm/smpeg2/package.nix index 925b59f3a44a..fa52e9aad9dd 100644 --- a/pkgs/by-name/sm/smpeg2/package.nix +++ b/pkgs/by-name/sm/smpeg2/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { moveToOutput bin/smpeg2-config "$dev" wrapProgram $dev/bin/smpeg2-config \ --prefix PATH ":" "${pkg-config}/bin" \ - --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig" + --prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL2}/lib/pkgconfig" ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/sr/srb2/package.nix b/pkgs/by-name/sr/srb2/package.nix index 3d2b1aae3e0c..208abc217571 100644 --- a/pkgs/by-name/sr/srb2/package.nix +++ b/pkgs/by-name/sr/srb2/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" - "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2.dev}/include/SDL2" + "-DSDL2_INCLUDE_DIR=${lib.getInclude SDL2}/include/SDL2" ]; patches = [ diff --git a/pkgs/by-name/ta/tamatool/package.nix b/pkgs/by-name/ta/tamatool/package.nix index 254d1b8a036b..8e0af3062c5d 100644 --- a/pkgs/by-name/ta/tamatool/package.nix +++ b/pkgs/by-name/ta/tamatool/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "-Clinux" "VERSION=${finalAttrs.version}" - "CFLAGS+=-I${SDL2.dev}/include/SDL2" + "CFLAGS+=-I${lib.getInclude SDL2}/include/SDL2" "CFLAGS+=-I${SDL2_image}/include/SDL2" "DIST_PATH=$(out)" "CC=${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index b65139f8a374..c9c23e185156 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { # disable parallel building as it caused sporadic build failures enableParallelBuilding = false; - env.NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; makeFlags = [ "config=release" ]; diff --git a/pkgs/by-name/tr/trigger/package.nix b/pkgs/by-name/tr/trigger/package.nix index 1352e9df786d..4c7ec3811a30 100644 --- a/pkgs/by-name/tr/trigger/package.nix +++ b/pkgs/by-name/tr/trigger/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { cd src sed s,lSDL2main,lSDL2, -i GNUmakefile - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getInclude SDL2}/include/SDL2" ''; makeFlags = [ diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 95e08c1f335d..649c72c0be2a 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -117,7 +117,7 @@ buildPythonPackage rec { env = { - SDL_CONFIG = "${SDL2.dev}/bin/sdl2-config"; + SDL_CONFIG = lib.getExe' (lib.getDev SDL2) "sdl2-config"; } // lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 76cf666873df..3c47f02131c2 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" # Expects SDL2.framework in specific location, which we don't have - "-DSDL2_INCLUDE_DIRS=${SDL2.dev}/include/SDL2" + "-DSDL2_INCLUDE_DIRS=${lib.getInclude SDL2}/include/SDL2" ]; installPhase = diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index 92ee59c6891c..b614d3b37f0f 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; env.NIX_CFLAGS_COMPILE = toString [ - "-I${SDL2.dev}/include/SDL2" + "-I${lib.getInclude SDL2}/include/SDL2" "-I${opusfile.dev}/include/opus" ]; NIX_CFLAGS_LINK = [ "-lSDL2" ];