Merge master into staging-next

authored by nixpkgs-ci[bot] and committed by GitHub 6f8ef929 406696e0

+34 -8
+5 -5
pkgs/applications/emulators/wine/sources.nix
··· 132 132 133 133 unstable = fetchurl rec { 134 134 # NOTE: Don't forget to change the hash for staging as well. 135 - version = "10.7"; 135 + version = "10.12"; 136 136 url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; 137 - hash = "sha256-dRNnoxCZkNcD5ZDi21MBh8Th39Lo5hNzq4S0L+EbGPo="; 137 + hash = "sha256-zVcscaPXLof5hJCyKMfCaq6z/eON2eefw7VjkdWZ1r8="; 138 138 139 139 patches = [ 140 140 # Also look for root certificates at $NIX_SSL_CERT_FILE ··· 144 144 # see https://gitlab.winehq.org/wine/wine-staging 145 145 staging = fetchFromGitLab { 146 146 inherit version; 147 - hash = "sha256-4doo7B3eEoQaml6KX02OhcLGGiLcgNhYq4ry/iB7kLc="; 147 + hash = "sha256-a5Vw9UVawx/vvTeu6SGxf4C1GwvdmpPJDyuW0PCUob8="; 148 148 domain = "gitlab.winehq.org"; 149 149 owner = "wine"; 150 150 repo = "wine-staging"; ··· 167 167 168 168 ## see http://wiki.winehq.org/Mono 169 169 mono = fetchurl rec { 170 - version = "10.0.0"; 170 + version = "10.1.0"; 171 171 url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; 172 - hash = "sha256-26ynPl0J96OnwVetBCia+cpHw87XAS1GVEpgcEaQK4c="; 172 + hash = "sha256-yIwkMYkLwyys7I1+pw5Tpa5LlcjFXKbnXvjbDkzPEHA="; 173 173 }; 174 174 175 175 updateScript = writeShellScript "update-wine-unstable" ''
+3 -3
pkgs/by-name/bi/bilibili/sources.nix
··· 1 1 # Generated by ./update.sh - do not update manually! 2 2 { 3 - version = "1.16.5-2"; 4 - arm64-hash = "sha256-7zbiswG0Q7cRMkJI22uk7VIpA8s5XS1CRL9nDyqUfq0="; 5 - x86_64-hash = "sha256-zTbHNrd75w0x2dYOfxyH37GlgG8HT0YExUxZQU+1M/Q="; 3 + version = "1.16.5-4"; 4 + arm64-hash = "sha256-8APk13cLzhOaPXCpkdX5OLpXM/EV93uR2LHuMaBeUb0="; 5 + x86_64-hash = "sha256-S7R4XmBnqyXugwf5henOZG5TzGUw4IrU42SXINm6Wcw="; 6 6 }
+2
pkgs/tools/security/ghidra/extensions.nix
··· 17 17 inherit ghidra; 18 18 }; 19 19 20 + ghidra-firmware-utils = self.callPackage ./extensions/ghidra-firmware-utils { }; 21 + 20 22 ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { }; 21 23 22 24 ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { };
+24
pkgs/tools/security/ghidra/extensions/ghidra-firmware-utils/default.nix
··· 1 + { 2 + buildGhidraExtension, 3 + fetchFromGitHub, 4 + lib, 5 + }: 6 + buildGhidraExtension (finalAttrs: { 7 + pname = "ghidra-firmware-utils"; 8 + version = "2024.04.20"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "al3xtjames"; 12 + repo = "ghidra-firmware-utils"; 13 + rev = finalAttrs.version; 14 + hash = "sha256-BbPRSD1EzgMA3TCKHyNqLjzEgiOm67mLJuOeFOTvd0I="; 15 + }; 16 + 17 + meta = { 18 + description = "Ghidra utilities for analyzing PC firmware"; 19 + homepage = "https://github.com/al3xtjames/ghidra-firmware-utils"; 20 + downloadPage = "https://github.com/al3xtjames/ghidra-firmware-utils/releases/tag/${finalAttrs.version}"; 21 + license = lib.licenses.asl20; 22 + maintainers = with lib.maintainers; [ timschumi ]; 23 + }; 24 + })