_7zz: 22.01 -> 23.01

author: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> 2023-08-16 22:39:50 -0400
committer: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> 2023-08-22 21:19:21 -0400
commit: 90cb3f4cdb66dbb4389471ada60b0b8716b5e0db (patch)
tree: 633a818070fcd8fb4bbfa8604ff14ae1a5dacbb7
parent: 5c3ec91c22e96f62f00fa27a67189e3bde83d446 (diff)
download: nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.gz
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.bz2
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.lz
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.xz
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.zst
nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.zip
5 files changed, 232 insertions, 577 deletions
diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index 06fb4aae1a0..76605861c34 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "7zz";
-  version = "22.01";
+  version = "23.01";
 
   src = fetchurl {
     url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz";
     hash = {
-      free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg=";
-      unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U=";
+      free = "sha256-F1ybQsyReF2NBR/3eMZySvxVEntpwq2VUlRCHp/5nZs=";
+      unfree = "sha256-NWBxAHNg5aGCTZkEmT6LJIC1G1cOjJ+vfA9Y6+S/n3Q=";
     }.${if enableUnfree then "unfree" else "free"};
     downloadToTemp = (!enableUnfree);
     # remove the unRAR related code from the src drv
@@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
   sourceRoot = ".";
 
   patches = [
-    ./fix-build-on-darwin.patch
     ./fix-cross-mingw-build.patch
+    # remove unneeded semicolons related to -Wextra-semi-stmt, caused by upstream
+    ./fix-empty-expr-stmt.patch
   ];
-  patchFlags = [ "-p0" ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
     substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
@@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
       # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction
       # the unRAR compression code is disabled by default
       lib.optionals enableUnfree [ unfree ];
-    maintainers = with maintainers; [ anna328p peterhoeg jk ];
+    maintainers = with maintainers; [ anna328p eclairevoyant jk peterhoeg ];
     platforms = platforms.unix ++ platforms.windows;
     mainProgram = "7zz";
   };
diff --git a/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch b/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch
deleted file mode 100644
index 9d8ee7f9bc6..00000000000
--- a/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp
---- CPP/7zip/Common/FileStreams.cpp
-+++ CPP/7zip/Common/FileStreams.cpp
-@@ -12,7 +12,7 @@
- #include <pwd.h>
- 
- // for major()/minor():
--#if defined(__FreeBSD__) || defined(BSD)
-+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
- #include <sys/types.h>
- #else
- #include <sys/sysmacros.h>
-diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp
---- CPP/7zip/UI/Common/UpdateCallback.cpp
-+++ CPP/7zip/UI/Common/UpdateCallback.cpp
-@@ -9,7 +9,7 @@
- // #include <pwd.h>
- 
- // for major()/minor():
--#if defined(__FreeBSD__) || defined(BSD)
-+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__)
- #include <sys/types.h>
- #else
- #include <sys/sysmacros.h>
diff --git a/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch
index 59608b52b79..4b0ccb6f2b0 100644
--- a/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch
+++ b/pkgs/tools/archivers/7zz/fix-cross-mingw-build.patch
@@ -1,7 +1,5 @@
-diff --git C/7zVersion.rc C/7zVersion.rc
-index 6ed26de7445..675e9bb0321 100755
---- C/7zVersion.rc
-+++ C/7zVersion.rc
+--- a/C/7zVersion.rc
++++ b/C/7zVersion.rc
 @@ -5,7 +5,7 @@
  #define MY_VFT_APP  0x00000001L
  #define MY_VFT_DLL  0x00000002L
@@ -11,106 +9,32 @@ index 6ed26de7445..675e9bb0321 100755
  
  #ifndef MY_VERSION
  #include "7zVersion.h"
-diff --git C/7zip_gcc_c.mak C/7zip_gcc_c.mak
-index d41810478db..43cdd51271e 100755
---- C/7zip_gcc_c.mak
-+++ C/7zip_gcc_c.mak
-@@ -93,7 +93,7 @@ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
+--- a/C/7zip_gcc_c.mak
++++ b/C/7zip_gcc_c.mak
+@@ -106,7 +106,7 @@
  endif
  
  
--LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32
-+LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32
+-LIB2 = -lOle32 -loleaut32 -luuid -ladvapi32 -lUser32 -lShell32
++LIB2 = -lole32 -loleaut32 -luuid -ladvapi32 -luser32 -lshell32
  
- CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
+ CFLAGS_EXTRA = -DUNICODE -D_UNICODE
  # -Wno-delete-non-virtual-dtor
-diff --git C/Alloc.c C/Alloc.c
-index 142a1ea2219..0d0107c56f4 100755
---- C/Alloc.c
-+++ C/Alloc.c
-@@ -6,7 +6,7 @@
- #include <stdio.h>
- 
- #ifdef _WIN32
--#include <Windows.h>
-+#include <windows.h>
- #endif
- #include <stdlib.h>
- 
-diff --git C/CpuArch.c C/CpuArch.c
-index a0e93e8b08e..36e0be0b1c8 100755
---- C/CpuArch.c
-+++ C/CpuArch.c
-@@ -217,7 +217,7 @@ BoolInt CPU_Is_InOrder()
- }
- 
- #if !defined(MY_CPU_AMD64) && defined(_WIN32)
--#include <Windows.h>
-+#include <windows.h>
- static BoolInt CPU_Sys_Is_SSE_Supported()
- {
-   OSVERSIONINFO vi;
-@@ -275,7 +275,7 @@ BoolInt CPU_IsSupported_SHA()
- // #include <stdio.h>
- 
- #ifdef _WIN32
--#include <Windows.h>
-+#include <windows.h>
- #endif
- 
- BoolInt CPU_IsSupported_AVX2()
-@@ -351,7 +351,7 @@ BoolInt CPU_IsSupported_PageGB()
- 
- #ifdef _WIN32
- 
--#include <Windows.h>
-+#include <windows.h>
- 
- BoolInt CPU_IsSupported_CRC32()  { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
- BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
-diff --git C/DllSecur.c C/DllSecur.c
-index a37c1b3e2c5..16755bba930 100755
---- C/DllSecur.c
-+++ C/DllSecur.c
-@@ -5,7 +5,7 @@
- 
- #ifdef _WIN32
- 
--#include <Windows.h>
-+#include <windows.h>
+--- a/CPP/7zip/7zip_gcc.mak
++++ b/CPP/7zip/7zip_gcc.mak
+@@ -124,8 +124,8 @@
+ DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
+ endif
  
- #include "DllSecur.h"
+-LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 -lShell32 $(LIB_HTMLHELP)
+-LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI)
++LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 $(LIB_HTMLHELP)
++LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI)
  
-diff --git C/Threads.h C/Threads.h
-index e9493afff62..71972558d48 100755
---- C/Threads.h
-+++ C/Threads.h
-@@ -5,7 +5,7 @@
- #define __7Z_THREADS_H
- 
- #ifdef _WIN32
--#include <Windows.h>
-+#include <windows.h>
- #else
- 
- #if defined(__linux__)
-diff --git C/Util/7zipInstall/7zipInstall.c C/Util/7zipInstall/7zipInstall.c
-index 2c498bb4392..d791bc4181c 100755
---- C/Util/7zipInstall/7zipInstall.c
-+++ C/Util/7zipInstall/7zipInstall.c
-@@ -10,7 +10,7 @@
- #endif
- 
- #include <windows.h>
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../../7z.h"
- #include "../../7zAlloc.h"
-diff --git C/Util/7zipInstall/resource.rc C/Util/7zipInstall/resource.rc
-index 4d6a91feda1..c19f601f69f 100755
---- C/Util/7zipInstall/resource.rc
-+++ C/Util/7zipInstall/resource.rc
+ CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
+ # -Wno-delete-non-virtual-dtor
+--- a/C/Util/7zipInstall/resource.rc
++++ b/C/Util/7zipInstall/resource.rc
 @@ -1,6 +1,6 @@
  #include <winnt.h>
  #include <WinUser.h>
@@ -119,23 +43,8 @@ index 4d6a91feda1..c19f601f69f 100755
  
  #define USE_COPYRIGHT_CR
  #include "../../7zVersion.rc"
-diff --git C/Util/7zipUninstall/7zipUninstall.c C/Util/7zipUninstall/7zipUninstall.c
-index 89cd764dbe9..32ece1c6c14 100755
---- C/Util/7zipUninstall/7zipUninstall.c
-+++ C/Util/7zipUninstall/7zipUninstall.c
-@@ -11,7 +11,7 @@
- // #define SZ_ERROR_ABORT 100
- 
- #include <windows.h>
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../../7zVersion.h"
- 
-diff --git C/Util/7zipUninstall/resource.rc C/Util/7zipUninstall/resource.rc
-index 506e0665cdd..ae1dfedc83b 100755
---- C/Util/7zipUninstall/resource.rc
-+++ C/Util/7zipUninstall/resource.rc
+--- a/C/Util/7zipUninstall/resource.rc
++++ b/C/Util/7zipUninstall/resource.rc
 @@ -1,6 +1,6 @@
  #include <winnt.h>
  #include <WinUser.h>
@@ -144,67 +53,8 @@ index 506e0665cdd..ae1dfedc83b 100755
  
  #define USE_COPYRIGHT_CR
  #include "../../7zVersion.rc"
-diff --git CPP/7zip/7zip_gcc.mak CPP/7zip/7zip_gcc.mak
-index 2a24e06aa1f..fb32b933201 100755
---- CPP/7zip/7zip_gcc.mak
-+++ CPP/7zip/7zip_gcc.mak
-@@ -113,8 +113,8 @@ MY_MKDIR=mkdir
- DEL_OBJ_EXE = -$(RM) $(O)\*.o $(O)\$(PROG).exe $(O)\$(PROG).dll
- endif
- 
--LIB2_GUI = -lOle32 -lGdi32 -lComctl32 -lComdlg32 $(LIB_HTMLHELP)
--LIB2 = -loleaut32 -luuid -ladvapi32 -lUser32 $(LIB2_GUI)
-+LIB2_GUI = -lole32 -lgdi32 -lcomctl32 -lcomdlg32 $(LIB_HTMLHELP)
-+LIB2 = -loleaut32 -luuid -ladvapi32 -luser32 $(LIB2_GUI)
- 
- CXXFLAGS_EXTRA = -DUNICODE -D_UNICODE
- # -Wno-delete-non-virtual-dtor
-diff --git CPP/7zip/Bundles/Fm/StdAfx.h CPP/7zip/Bundles/Fm/StdAfx.h
-index c15e07939da..d1e094cc339 100755
---- CPP/7zip/Bundles/Fm/StdAfx.h
-+++ CPP/7zip/Bundles/Fm/StdAfx.h
-@@ -9,8 +9,8 @@
- 
- #include "../../../Common/Common.h"
- 
--#include <CommCtrl.h>
--#include <ShlObj.h>
--#include <Shlwapi.h>
-+#include <commctrl.h>
-+#include <shlobj.h>
-+#include <shlwapi.h>
- 
- #endif
-diff --git CPP/7zip/Bundles/SFXWin/SfxWin.cpp CPP/7zip/Bundles/SFXWin/SfxWin.cpp
-index cf3bad389a0..260484c11e4 100755
---- CPP/7zip/Bundles/SFXWin/SfxWin.cpp
-+++ CPP/7zip/Bundles/SFXWin/SfxWin.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <Shlwapi.h>
-+#include <shlwapi.h>
- 
- #include "../../../Common/MyInitGuid.h"
- 
-diff --git CPP/7zip/Bundles/SFXWin/StdAfx.h CPP/7zip/Bundles/SFXWin/StdAfx.h
-index f263ecb77c5..e96640e995c 100755
---- CPP/7zip/Bundles/SFXWin/StdAfx.h
-+++ CPP/7zip/Bundles/SFXWin/StdAfx.h
-@@ -6,7 +6,7 @@
- #include "../../../Common/Common.h"
- 
- #include <commctrl.h>
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- // #define printf(x) NO_PRINTF_(x)
- // #define sprintf(x) NO_SPRINTF_(x)
-diff --git CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/RandGen.cpp
-index c123109a15b..c3709ccff6b 100755
---- CPP/7zip/Crypto/RandGen.cpp
-+++ CPP/7zip/Crypto/RandGen.cpp
+--- a/CPP/7zip/Crypto/RandGen.cpp
++++ b/CPP/7zip/Crypto/RandGen.cpp
 @@ -19,7 +19,7 @@
  
  #ifdef USE_STATIC_RtlGenRandom
@@ -214,10 +64,8 @@ index c123109a15b..c3709ccff6b 100755
  
  EXTERN_C_BEGIN
  #ifndef RtlGenRandom
-diff --git CPP/7zip/GuiCommon.rc CPP/7zip/GuiCommon.rc
-index 565ee702ef9..13043ef4c53 100755
---- CPP/7zip/GuiCommon.rc
-+++ CPP/7zip/GuiCommon.rc
+--- a/CPP/7zip/GuiCommon.rc
++++ b/CPP/7zip/GuiCommon.rc
 @@ -4,7 +4,7 @@
  // #include <WinUser.h>
  
@@ -227,186 +75,8 @@ index 565ee702ef9..13043ef4c53 100755
  
  
  LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-diff --git CPP/7zip/MyVersionInfo.rc CPP/7zip/MyVersionInfo.rc
-index eddf8935c84..90e65376be8 100755
---- CPP/7zip/MyVersionInfo.rc
-+++ CPP/7zip/MyVersionInfo.rc
-@@ -1,2 +1,2 @@
- #include "MyVersion.h"
--#include "..\..\C\7zVersion.rc"
-+#include "../../C/7zVersion.rc"
-diff --git CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/Update.cpp
-index 5490ff445a0..003ee6634ea 100755
---- CPP/7zip/UI/Common/Update.cpp
-+++ CPP/7zip/UI/Common/Update.cpp
-@@ -1163,7 +1163,7 @@ static HRESULT EnumerateInArchiveItems(
- 
- #if defined(_WIN32) && !defined(UNDER_CE)
- 
--#include <MAPI.h>
-+#include <mapi.h>
- 
- #endif
- 
-diff --git CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/Main.cpp
-index 363572cd3dd..765f55293a7 100755
---- CPP/7zip/UI/Console/Main.cpp
-+++ CPP/7zip/UI/Console/Main.cpp
-@@ -5,7 +5,7 @@
- #include "../../../Common/MyWindows.h"
- 
- #ifdef _WIN32
--#include <Psapi.h>
-+#include <psapi.h>
- #else
- #include <unistd.h>
- #include <sys/ioctl.h>
-diff --git CPP/7zip/UI/Explorer/ContextMenu.h CPP/7zip/UI/Explorer/ContextMenu.h
-index e60ffccf11b..aea34e7de07 100755
---- CPP/7zip/UI/Explorer/ContextMenu.h
-+++ CPP/7zip/UI/Explorer/ContextMenu.h
-@@ -5,7 +5,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "MyExplorerCommand.h"
- 
-diff --git CPP/7zip/UI/Explorer/DllExportsExplorer.cpp CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
-index 84c92e2e2d3..df126d8d232 100755
---- CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
-+++ CPP/7zip/UI/Explorer/DllExportsExplorer.cpp
-@@ -11,7 +11,7 @@
- #include "../../../Common/MyWindows.h"
- // #include "../../../Common/IntToString.h"
- 
--#include <OleCtl.h>
-+#include <olectl.h>
- 
- #include "../../../Common/MyInitGuid.h"
- 
-diff --git CPP/7zip/UI/Explorer/MyExplorerCommand.h CPP/7zip/UI/Explorer/MyExplorerCommand.h
-index b1997f0da6e..d1d038df11b 100755
---- CPP/7zip/UI/Explorer/MyExplorerCommand.h
-+++ CPP/7zip/UI/Explorer/MyExplorerCommand.h
-@@ -17,7 +17,7 @@
-     ShObjIdl.h      : old Windows SDK
-     ShObjIdl_core.h : new Windows 10 SDK */
- 
--#include <ShObjIdl.h>
-+#include <shobjidl.h>
- 
- #ifndef __IShellItem_INTERFACE_DEFINED__
- #define __IShellItem_INTERFACE_DEFINED__
-diff --git CPP/7zip/UI/Explorer/StdAfx.h CPP/7zip/UI/Explorer/StdAfx.h
-index 35e8b337d68..16883ceda1b 100755
---- CPP/7zip/UI/Explorer/StdAfx.h
-+++ CPP/7zip/UI/Explorer/StdAfx.h
-@@ -9,6 +9,6 @@
- 
- #include "../../../Common/Common.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #endif
-diff --git CPP/7zip/UI/FileManager/BrowseDialog.cpp CPP/7zip/UI/FileManager/BrowseDialog.cpp
-index e43172385b6..286faeeb660 100755
---- CPP/7zip/UI/FileManager/BrowseDialog.cpp
-+++ CPP/7zip/UI/FileManager/BrowseDialog.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <CommCtrl.h>
-+#include <commctrl.h>
- 
- #ifndef UNDER_CE
- #include "../../../Windows/CommonDialog.h"
-diff --git CPP/7zip/UI/FileManager/FM.cpp CPP/7zip/UI/FileManager/FM.cpp
-index b0b3715c9a5..14af8c32288 100755
---- CPP/7zip/UI/FileManager/FM.cpp
-+++ CPP/7zip/UI/FileManager/FM.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <Shlwapi.h>
-+#include <shlwapi.h>
- 
- #include "../../../../C/Alloc.h"
- #ifdef _WIN32
-diff --git CPP/7zip/UI/FileManager/FSFolderCopy.cpp CPP/7zip/UI/FileManager/FSFolderCopy.cpp
-index b0e1146816d..16208e58f6b 100755
---- CPP/7zip/UI/FileManager/FSFolderCopy.cpp
-+++ CPP/7zip/UI/FileManager/FSFolderCopy.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <WinBase.h>
-+#include <winbase.h>
- 
- #include "../../../Common/Defs.h"
- #include "../../../Common/StringConvert.h"
-diff --git CPP/7zip/UI/FileManager/HelpUtils.cpp CPP/7zip/UI/FileManager/HelpUtils.cpp
-index 94253a70f5c..3f4479dbddd 100755
---- CPP/7zip/UI/FileManager/HelpUtils.cpp
-+++ CPP/7zip/UI/FileManager/HelpUtils.cpp
-@@ -24,7 +24,7 @@ void ShowHelpWindow(LPCSTR)
- #include "../../../Windows/FileName.h"
- 
- #else
--#include <HtmlHelp.h>
-+#include <htmlhelp.h>
- #endif
- 
- #include "../../../Common/StringConvert.h"
-diff --git CPP/7zip/UI/FileManager/MyWindowsNew.h CPP/7zip/UI/FileManager/MyWindowsNew.h
-index c0fe8439b98..ba7d608b90e 100755
---- CPP/7zip/UI/FileManager/MyWindowsNew.h
-+++ CPP/7zip/UI/FileManager/MyWindowsNew.h
-@@ -5,7 +5,7 @@
- 
- #ifdef _MSC_VER
- 
--#include <ShObjIdl.h>
-+#include <shobjidl.h>
- 
- #ifndef __ITaskbarList3_INTERFACE_DEFINED__
- #define __ITaskbarList3_INTERFACE_DEFINED__
-diff --git CPP/7zip/UI/FileManager/Panel.cpp CPP/7zip/UI/FileManager/Panel.cpp
-index f7162e502ac..2eaf9e1266b 100755
---- CPP/7zip/UI/FileManager/Panel.cpp
-+++ CPP/7zip/UI/FileManager/Panel.cpp
-@@ -2,7 +2,7 @@
- 
- #include "StdAfx.h"
- 
--#include <WindowsX.h>
-+#include <windowsx.h>
- // #include <stdio.h>
- 
- #include "../../../Common/IntToString.h"
-diff --git CPP/7zip/UI/FileManager/Panel.h CPP/7zip/UI/FileManager/Panel.h
-index 5a9fef01de2..1f2b86a8e43 100755
---- CPP/7zip/UI/FileManager/Panel.h
-+++ CPP/7zip/UI/FileManager/Panel.h
-@@ -5,7 +5,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../../../../C/Alloc.h"
- 
-diff --git CPP/7zip/UI/FileManager/PanelItemOpen.cpp CPP/7zip/UI/FileManager/PanelItemOpen.cpp
-index 6af42c96923..595acdbb563 100755
---- CPP/7zip/UI/FileManager/PanelItemOpen.cpp
-+++ CPP/7zip/UI/FileManager/PanelItemOpen.cpp
+--- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
++++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp
 @@ -4,7 +4,7 @@
  
  #include "../../../Common/MyWindows.h"
@@ -416,52 +86,8 @@ index 6af42c96923..595acdbb563 100755
  
  #include "../../../Common/IntToString.h"
  
-diff --git CPP/7zip/UI/FileManager/RootFolder.cpp CPP/7zip/UI/FileManager/RootFolder.cpp
-index 6984434026f..d50c1eb832e 100755
---- CPP/7zip/UI/FileManager/RootFolder.cpp
-+++ CPP/7zip/UI/FileManager/RootFolder.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../../../Common/StringConvert.h"
- 
-diff --git CPP/7zip/UI/FileManager/StdAfx.h CPP/7zip/UI/FileManager/StdAfx.h
-index 74cfbc6deef..88960aa8c58 100755
---- CPP/7zip/UI/FileManager/StdAfx.h
-+++ CPP/7zip/UI/FileManager/StdAfx.h
-@@ -14,8 +14,8 @@
- 
- // #include "../../../Common/MyWindows.h"
- 
--// #include <CommCtrl.h>
--// #include <ShlObj.h>
--// #include <Shlwapi.h>
-+// #include <commctrl.h>
-+// #include <shlobj.h>
-+// #include <shlwapi.h>
- 
- #endif
-diff --git CPP/7zip/UI/FileManager/SysIconUtils.cpp CPP/7zip/UI/FileManager/SysIconUtils.cpp
-index 43c613244a8..1cdf1d4c5b3 100755
---- CPP/7zip/UI/FileManager/SysIconUtils.cpp
-+++ CPP/7zip/UI/FileManager/SysIconUtils.cpp
-@@ -10,7 +10,7 @@
- 
- #include "SysIconUtils.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #define MY_CAST_FUNC  (void(*)())
- // #define MY_CAST_FUNC
-diff --git CPP/7zip/UI/FileManager/SysIconUtils.h CPP/7zip/UI/FileManager/SysIconUtils.h
-index ba747d9ded0..2eedc4be403 100755
---- CPP/7zip/UI/FileManager/SysIconUtils.h
-+++ CPP/7zip/UI/FileManager/SysIconUtils.h
+--- a/CPP/7zip/UI/FileManager/SysIconUtils.h
++++ b/CPP/7zip/UI/FileManager/SysIconUtils.h
 @@ -5,7 +5,7 @@
  
  #include "../../../Common/MyWindows.h"
@@ -471,79 +97,8 @@ index ba747d9ded0..2eedc4be403 100755
  
  #include "../../../Common/MyString.h"
  
-diff --git CPP/7zip/UI/FileManager/SystemPage.cpp CPP/7zip/UI/FileManager/SystemPage.cpp
-index ff68172e2bf..06025259c85 100755
---- CPP/7zip/UI/FileManager/SystemPage.cpp
-+++ CPP/7zip/UI/FileManager/SystemPage.cpp
-@@ -4,7 +4,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../../../Common/Defs.h"
- #include "../../../Common/StringConvert.h"
-diff --git CPP/7zip/UI/GUI/GUI.cpp CPP/7zip/UI/GUI/GUI.cpp
-index 0cc2ee3afcc..4ffc2384668 100755
---- CPP/7zip/UI/GUI/GUI.cpp
-+++ CPP/7zip/UI/GUI/GUI.cpp
-@@ -8,7 +8,7 @@
- 
- #include "../../../Common/MyWindows.h"
- 
--#include <Shlwapi.h>
-+#include <shlwapi.h>
- 
- #include "../../../Common/MyInitGuid.h"
- 
-diff --git CPP/7zip/UI/GUI/StdAfx.h CPP/7zip/UI/GUI/StdAfx.h
-index 498b2fcbe4b..3c830f6a3d4 100755
---- CPP/7zip/UI/GUI/StdAfx.h
-+++ CPP/7zip/UI/GUI/StdAfx.h
-@@ -11,9 +11,9 @@
- 
- // #include "../../../Common/MyWindows.h"
- 
--// #include <CommCtrl.h>
--// #include <ShlObj.h>
--// #include <Shlwapi.h>
-+// #include <commctrl.h>
-+// #include <shlobj.h>
-+// #include <shlwapi.h>
- 
- // #define printf(x) NO_PRINTF_(x)
- // #define sprintf(x) NO_SPRINTF_(x)
-diff --git CPP/Common/MyInitGuid.h CPP/Common/MyInitGuid.h
-index 6895097371a..6b2f3f35d5a 100755
---- CPP/Common/MyInitGuid.h
-+++ CPP/Common/MyInitGuid.h
-@@ -29,7 +29,7 @@ Also we need IID_IUnknown that is initialized in some file for linking:
- #include <basetyps.h>
- #endif
- 
--#include <InitGuid.h>
-+#include <initguid.h>
- 
- #ifdef UNDER_CE
- DEFINE_GUID(IID_IUnknown,
-diff --git CPP/Common/MyWindows.h CPP/Common/MyWindows.h
-index 69eed8f6446..f48680f9d05 100755
---- CPP/Common/MyWindows.h
-+++ CPP/Common/MyWindows.h
-@@ -5,7 +5,7 @@
- 
- #ifdef _WIN32
- 
--#include <Windows.h>
-+#include <windows.h>
- 
- #ifdef UNDER_CE
-   #undef VARIANT_TRUE
-diff --git CPP/Windows/Control/ComboBox.h CPP/Windows/Control/ComboBox.h
-index 8ab9ce5027d..8b12599b785 100755
---- CPP/Windows/Control/ComboBox.h
-+++ CPP/Windows/Control/ComboBox.h
+--- a/CPP/Windows/Control/ComboBox.h
++++ b/CPP/Windows/Control/ComboBox.h
 @@ -5,7 +5,7 @@
  
  #include "../../Common/MyWindows.h"
@@ -553,10 +108,8 @@ index 8ab9ce5027d..8b12599b785 100755
  
  #include "../Window.h"
  
-diff --git CPP/Windows/Control/ImageList.h CPP/Windows/Control/ImageList.h
-index e59443058b8..f72ea0d1990 100755
---- CPP/Windows/Control/ImageList.h
-+++ CPP/Windows/Control/ImageList.h
+--- a/CPP/Windows/Control/ImageList.h
++++ b/CPP/Windows/Control/ImageList.h
 @@ -3,7 +3,7 @@
  #ifndef __WINDOWS_CONTROL_IMAGE_LIST_H
  #define __WINDOWS_CONTROL_IMAGE_LIST_H
@@ -566,10 +119,8 @@ index e59443058b8..f72ea0d1990 100755
  
  #include "../Defs.h"
  
-diff --git CPP/Windows/Control/ListView.h CPP/Windows/Control/ListView.h
-index 56e1100c726..cbd9cd1e21d 100755
---- CPP/Windows/Control/ListView.h
-+++ CPP/Windows/Control/ListView.h
+--- a/CPP/Windows/Control/ListView.h
++++ b/CPP/Windows/Control/ListView.h
 @@ -5,7 +5,7 @@
  
  #include "../../Common/MyWindows.h"
@@ -579,10 +130,8 @@ index 56e1100c726..cbd9cd1e21d 100755
  
  #include "../Window.h"
  
-diff --git CPP/Windows/Control/ProgressBar.h CPP/Windows/Control/ProgressBar.h
-index 741315dd4dd..f18d89c14f0 100755
---- CPP/Windows/Control/ProgressBar.h
-+++ CPP/Windows/Control/ProgressBar.h
+--- a/CPP/Windows/Control/ProgressBar.h
++++ b/CPP/Windows/Control/ProgressBar.h
 @@ -5,7 +5,7 @@
  
  #include "../../Common/MyWindows.h"
@@ -592,49 +141,8 @@ index 741315dd4dd..f18d89c14f0 100755
  
  #include "../Window.h"
  
-diff --git CPP/Windows/Control/PropertyPage.h CPP/Windows/Control/PropertyPage.h
-index 97c87b3b453..551c95994c2 100755
---- CPP/Windows/Control/PropertyPage.h
-+++ CPP/Windows/Control/PropertyPage.h
-@@ -5,7 +5,7 @@
- 
- #include "../../Common/MyWindows.h"
- 
--#include <PrSht.h>
-+#include <prsht.h>
- 
- #include "Dialog.h"
- 
-diff --git CPP/Windows/FileIO.h CPP/Windows/FileIO.h
-index 9146491d236..e11022f82d4 100755
---- CPP/Windows/FileIO.h
-+++ CPP/Windows/FileIO.h
-@@ -17,7 +17,7 @@
- #ifdef _WIN32
- 
- #if defined(_WIN32) && !defined(UNDER_CE)
--#include <WinIoCtl.h>
-+#include <winioctl.h>
- #endif
- 
- #else
-diff --git CPP/Windows/ProcessUtils.h CPP/Windows/ProcessUtils.h
-index 64ebe3775e4..de46c6f52a5 100755
---- CPP/Windows/ProcessUtils.h
-+++ CPP/Windows/ProcessUtils.h
-@@ -3,7 +3,7 @@
- #ifndef __WINDOWS_PROCESS_UTILS_H
- #define __WINDOWS_PROCESS_UTILS_H
- 
--#include <Psapi.h>
-+#include <psapi.h>
- 
- #include "../Common/MyString.h"
- 
-diff --git CPP/Windows/SecurityUtils.h CPP/Windows/SecurityUtils.h
-index de62035ec86..18a083fc580 100755
---- CPP/Windows/SecurityUtils.h
-+++ CPP/Windows/SecurityUtils.h
+--- a/CPP/Windows/SecurityUtils.h
++++ b/CPP/Windows/SecurityUtils.h
 @@ -3,7 +3,7 @@
  #ifndef __WINDOWS_SECURITY_UTILS_H
  #define __WINDOWS_SECURITY_UTILS_H
@@ -644,16 +152,3 @@ index de62035ec86..18a083fc580 100755
  
  #include "Defs.h"
  
-diff --git CPP/Windows/Shell.h CPP/Windows/Shell.h
-index 30388bc5a70..dc3daa5e60b 100755
---- CPP/Windows/Shell.h
-+++ CPP/Windows/Shell.h
-@@ -4,7 +4,7 @@
- #define __WINDOWS_SHELL_H
- 
- #include "../Common/MyWindows.h"
--#include <ShlObj.h>
-+#include <shlobj.h>
- 
- #include "../Common/MyString.h"
- 
diff --git a/pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch b/pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch
new file mode 100644
index 00000000000..7583482d5d3
--- /dev/null
+++ b/pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch
@@ -0,0 +1,184 @@
+diff -Naur a/C/7zCrc.c b/C/7zCrc.c
+--- a/C/7zCrc.c
++++ b/C/7zCrc.c
+@@ -174,7 +174,7 @@
+ UInt32 Z7_FASTCALL CrcUpdateT0_32(UInt32 v, const void *data, size_t size, const UInt32 *table)
+ {
+   const Byte *p = (const Byte *)data;
+-  UNUSED_VAR(table);
++  UNUSED_VAR(table)
+ 
+   for (; size != 0 && ((unsigned)(ptrdiff_t)p & (T0_32_UNROLL_BYTES - 1)) != 0; size--)
+     v = __crc32b(v, *p++);
+@@ -206,7 +206,7 @@
+ UInt32 Z7_FASTCALL CrcUpdateT0_64(UInt32 v, const void *data, size_t size, const UInt32 *table)
+ {
+   const Byte *p = (const Byte *)data;
+-  UNUSED_VAR(table);
++  UNUSED_VAR(table)
+ 
+   for (; size != 0 && ((unsigned)(ptrdiff_t)p & (T0_64_UNROLL_BYTES - 1)) != 0; size--)
+     v = __crc32b(v, *p++);
+diff -Naur a/C/AesOpt.c b/C/AesOpt.c
+--- a/C/AesOpt.c
++++ b/C/AesOpt.c
+@@ -639,7 +639,7 @@
+   const v128 k_z0 = w[2];
+   for (; numBlocks != 0; numBlocks--, data++)
+   {
+-    MM_XOR_m (*data);
++    MM_XOR_m (*data)
+     AES_E_MC_m (k0)
+     AES_E_MC_m (k1)
+     AES_E_MC_m (k2)
+@@ -660,7 +660,7 @@
+       }
+     }
+     AES_E_m  (k_z1)
+-    MM_XOR_m (k_z0);
++    MM_XOR_m (k_z0)
+     *data = m;
+   }
+   *p = m;
+@@ -745,7 +745,7 @@
+     while (w != p);
+     WOP_KEY (AES_D,   1)
+     WOP_KEY (AES_XOR, 0)
+-    MM_XOR (m0, iv);
++    MM_XOR (m0, iv)
+     WOP_M1 (XOR_data_M1)
+     iv = data[NUM_WAYS - 1];
+     WOP (STORE_data)
+@@ -759,14 +759,14 @@
+     AES_D_IMC_m (w[2])
+     do
+     {
+-      AES_D_IMC_m (w[1]);
+-      AES_D_IMC_m (w[0]);
++      AES_D_IMC_m (w[1])
++      AES_D_IMC_m (w[0])
+       w -= 2;
+     }
+     while (w != p);
+-    AES_D_m  (w[1]);
+-    MM_XOR_m (w[0]);
+-    MM_XOR_m (iv);
++    AES_D_m  (w[1])
++    MM_XOR_m (w[0])
++    MM_XOR_m (iv)
+     iv = *data;
+     *data = m;
+   }
+@@ -809,11 +809,11 @@
+   {
+     const v128 *w = p;
+     v128 m;
+-    CTR_START (m, 0);
++    CTR_START (m, 0)
+     do
+     {
+-      AES_E_MC_m (w[0]);
+-      AES_E_MC_m (w[1]);
++      AES_E_MC_m (w[0])
++      AES_E_MC_m (w[1])
+       w += 2;
+     }
+     while (w != wEnd);
+diff -Naur a/C/LzmaEnc.c b/C/LzmaEnc.c
+--- a/C/LzmaEnc.c
++++ b/C/LzmaEnc.c
+@@ -195,11 +195,11 @@
+ unsigned GetPosSlot1(UInt32 pos)
+ {
+   unsigned res;
+-  BSR2_RET(pos, res);
++  BSR2_RET(pos, res)
+   return res;
+ }
+-#define GetPosSlot2(pos, res) { BSR2_RET(pos, res); }
+-#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res); }
++#define GetPosSlot2(pos, res) { BSR2_RET(pos, res) }
++#define GetPosSlot(pos, res) { if (pos < 2) res = pos; else BSR2_RET(pos, res) }
+ 
+ 
+ #else // ! LZMA_LOG_BSR
+diff -Naur a/C/Sha1Opt.c b/C/Sha1Opt.c
+--- a/C/Sha1Opt.c
++++ b/C/Sha1Opt.c
+@@ -300,26 +300,26 @@
+     LOAD_SHUFFLE (m2, 2)
+     LOAD_SHUFFLE (m3, 3)
+                      
+-    T(m0, c0);                                  H(e1); C(e0);
+-    T(m1, c0);  SU0(m0, m1, m2);                H(e0); C(e1);
+-    T(m2, c0);  SU0(m1, m2, m3);  SU1(m0, m3);  H(e1); C(e0);
+-    T(m3, c0);  SU0(m2, m3, m0);  SU1(m1, m0);  H(e0); C(e1);
+-    T(m0, c0);  SU0(m3, m0, m1);  SU1(m2, m1);  H(e1); C(e0);
+-    T(m1, c1);  SU0(m0, m1, m2);  SU1(m3, m2);  H(e0); P(e1);
+-    T(m2, c1);  SU0(m1, m2, m3);  SU1(m0, m3);  H(e1); P(e0);
+-    T(m3, c1);  SU0(m2, m3, m0);  SU1(m1, m0);  H(e0); P(e1);
+-    T(m0, c1);  SU0(m3, m0, m1);  SU1(m2, m1);  H(e1); P(e0);
+-    T(m1, c1);  SU0(m0, m1, m2);  SU1(m3, m2);  H(e0); P(e1);
+-    T(m2, c2);  SU0(m1, m2, m3);  SU1(m0, m3);  H(e1); M(e0);
+-    T(m3, c2);  SU0(m2, m3, m0);  SU1(m1, m0);  H(e0); M(e1);
+-    T(m0, c2);  SU0(m3, m0, m1);  SU1(m2, m1);  H(e1); M(e0);
+-    T(m1, c2);  SU0(m0, m1, m2);  SU1(m3, m2);  H(e0); M(e1);
+-    T(m2, c2);  SU0(m1, m2, m3);  SU1(m0, m3);  H(e1); M(e0);
+-    T(m3, c3);  SU0(m2, m3, m0);  SU1(m1, m0);  H(e0); P(e1);
+-    T(m0, c3);  SU0(m3, m0, m1);  SU1(m2, m1);  H(e1); P(e0);
+-    T(m1, c3);                    SU1(m3, m2);  H(e0); P(e1);
+-    T(m2, c3);                                  H(e1); P(e0);
+-    T(m3, c3);                                  H(e0); P(e1);
++    T(m0, c0);                                H(e1); C(e0)
++    T(m1, c0);  SU0(m0, m1, m2)               H(e0); C(e1)
++    T(m2, c0);  SU0(m1, m2, m3)  SU1(m0, m3)  H(e1); C(e0)
++    T(m3, c0);  SU0(m2, m3, m0)  SU1(m1, m0)  H(e0); C(e1)
++    T(m0, c0);  SU0(m3, m0, m1)  SU1(m2, m1)  H(e1); C(e0)
++    T(m1, c1);  SU0(m0, m1, m2)  SU1(m3, m2)  H(e0); P(e1)
++    T(m2, c1);  SU0(m1, m2, m3)  SU1(m0, m3)  H(e1); P(e0)
++    T(m3, c1);  SU0(m2, m3, m0)  SU1(m1, m0)  H(e0); P(e1)
++    T(m0, c1);  SU0(m3, m0, m1)  SU1(m2, m1)  H(e1); P(e0)
++    T(m1, c1);  SU0(m0, m1, m2)  SU1(m3, m2)  H(e0); P(e1)
++    T(m2, c2);  SU0(m1, m2, m3)  SU1(m0, m3)  H(e1); M(e0)
++    T(m3, c2);  SU0(m2, m3, m0)  SU1(m1, m0)  H(e0); M(e1)
++    T(m0, c2);  SU0(m3, m0, m1)  SU1(m2, m1)  H(e1); M(e0)
++    T(m1, c2);  SU0(m0, m1, m2)  SU1(m3, m2)  H(e0); M(e1)
++    T(m2, c2);  SU0(m1, m2, m3)  SU1(m0, m3)  H(e1); M(e0)
++    T(m3, c3);  SU0(m2, m3, m0)  SU1(m1, m0)  H(e0); P(e1)
++    T(m0, c3);  SU0(m3, m0, m1)  SU1(m2, m1)  H(e1); P(e0)
++    T(m1, c3);                   SU1(m3, m2)  H(e0); P(e1)
++    T(m2, c3);                                H(e1); P(e0)
++    T(m3, c3);                                H(e0); P(e1)
+                                                                                                                      
+     abcd = vaddq_u32(abcd, abcd_save);
+     e0 += e0_save;
+diff -Naur a/C/Sha256Opt.c b/C/Sha256Opt.c
+--- a/C/Sha256Opt.c
++++ b/C/Sha256Opt.c
+@@ -316,10 +316,10 @@
+     LOAD_SHUFFLE (m2, 2)
+     LOAD_SHUFFLE (m3, 3)
+ 
+-    R16 ( 0, NNN, NNN, SM1, NNN, SM1, SM2, SM1, SM2 );
+-    R16 ( 1, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 );
+-    R16 ( 2, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 );
+-    R16 ( 3, SM1, SM2, NNN, SM2, NNN, NNN, NNN, NNN );
++    R16 ( 0, NNN, NNN, SM1, NNN, SM1, SM2, SM1, SM2 )
++    R16 ( 1, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 )
++    R16 ( 2, SM1, SM2, SM1, SM2, SM1, SM2, SM1, SM2 )
++    R16 ( 3, SM1, SM2, NNN, SM2, NNN, NNN, NNN, NNN )
+     
+     state0 = vaddq_u32(state0, state0_save);
+     state1 = vaddq_u32(state1, state1_save);
+diff -Naur a/CPP/Windows/System.h b/CPP/Windows/System.h
+--- a/CPP/Windows/System.h
++++ b/CPP/Windows/System.h
+@@ -105,7 +105,7 @@
+   }
+   
+   void CpuZero() { }
+-  void CpuSet(unsigned cpuIndex) { UNUSED_VAR(cpuIndex); }
++  void CpuSet(unsigned cpuIndex) { UNUSED_VAR(cpuIndex) }
+   int IsCpuSet(unsigned cpuIndex) const { return (cpuIndex < numSysThreads) ? 1 : 0; }
+ 
+   BOOL SetProcAffinity() const
diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh
index 1a6d38ea609..f641cf9ad0c 100755
--- a/pkgs/tools/archivers/7zz/update.sh
+++ b/pkgs/tools/archivers/7zz/update.sh
@@ -8,7 +8,7 @@ DRV_DIR="$PWD"
 OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
 # The best_release.json is not always up-to-date
 # In those cases you can force the version by calling `./update.sh <newer_version>`
-NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}"
+NEW_VERSION="${1:-$(curl -H "Accept: application/json" 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}"
 
 echo "comparing versions $OLD_VERSION => $NEW_VERSION"
 if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
author	éclairevoyant <848000+eclairevoyant@users.noreply.github.com>	2023-08-16 22:39:50 -0400
committer	éclairevoyant <848000+eclairevoyant@users.noreply.github.com>	2023-08-22 21:19:21 -0400
commit	90cb3f4cdb66dbb4389471ada60b0b8716b5e0db (patch)
tree	633a818070fcd8fb4bbfa8604ff14ae1a5dacbb7
parent	5c3ec91c22e96f62f00fa27a67189e3bde83d446 (diff)
download	nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.gz nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.bz2 nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.lz nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.xz nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.tar.zst nixpkgs-90cb3f4cdb66dbb4389471ada60b0b8716b5e0db.zip