Unverified Commit 6f8ef929 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 406696e0 6c6254bd

pkgs/applications/emulators/wine/sources.nix

+5 −5
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ rec { 


  unstable = fetchurl rec {

    # NOTE: Don't forget to change the hash for staging as well.

    version = "10.7";

    version = "10.12";

    url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";

    hash = "sha256-dRNnoxCZkNcD5ZDi21MBh8Th39Lo5hNzq4S0L+EbGPo=";

    hash = "sha256-zVcscaPXLof5hJCyKMfCaq6z/eON2eefw7VjkdWZ1r8=";



    patches = [

      # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -144,7 +144,7 @@ rec { 
    # see https://gitlab.winehq.org/wine/wine-staging

    staging = fetchFromGitLab {

      inherit version;

      hash = "sha256-4doo7B3eEoQaml6KX02OhcLGGiLcgNhYq4ry/iB7kLc=";

      hash = "sha256-a5Vw9UVawx/vvTeu6SGxf4C1GwvdmpPJDyuW0PCUob8=";

      domain = "gitlab.winehq.org";

      owner = "wine";

      repo = "wine-staging";
@@ -167,9 +167,9 @@ rec { 


    ## see http://wiki.winehq.org/Mono

    mono = fetchurl rec {

      version = "10.0.0";

      version = "10.1.0";

      url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";

      hash = "sha256-26ynPl0J96OnwVetBCia+cpHw87XAS1GVEpgcEaQK4c=";

      hash = "sha256-yIwkMYkLwyys7I1+pw5Tpa5LlcjFXKbnXvjbDkzPEHA=";

    };



    updateScript = writeShellScript "update-wine-unstable" ''

pkgs/by-name/bi/bilibili/sources.nix

+3 −3
Original line number Diff line number Diff line 
# Generated by ./update.sh - do not update manually!

{

  version = "1.16.5-2";

  arm64-hash = "sha256-7zbiswG0Q7cRMkJI22uk7VIpA8s5XS1CRL9nDyqUfq0=";

  x86_64-hash = "sha256-zTbHNrd75w0x2dYOfxyH37GlgG8HT0YExUxZQU+1M/Q=";

  version = "1.16.5-4";

  arm64-hash = "sha256-8APk13cLzhOaPXCpkdX5OLpXM/EV93uR2LHuMaBeUb0=";

  x86_64-hash = "sha256-S7R4XmBnqyXugwf5henOZG5TzGUw4IrU42SXINm6Wcw=";

}

pkgs/tools/security/ghidra/extensions.nix

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ lib.makeScope newScope (self: { 
    inherit ghidra;

  };



  ghidra-firmware-utils = self.callPackage ./extensions/ghidra-firmware-utils { };



  ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { };



  ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { };

pkgs/tools/security/ghidra/extensions/ghidra-firmware-utils/default.nix

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{

  buildGhidraExtension,

  fetchFromGitHub,

  lib,

}:

buildGhidraExtension (finalAttrs: {

  pname = "ghidra-firmware-utils";

  version = "2024.04.20";



  src = fetchFromGitHub {

    owner = "al3xtjames";

    repo = "ghidra-firmware-utils";

    rev = finalAttrs.version;

    hash = "sha256-BbPRSD1EzgMA3TCKHyNqLjzEgiOm67mLJuOeFOTvd0I=";

  };



  meta = {

    description = "Ghidra utilities for analyzing PC firmware";

    homepage = "https://github.com/al3xtjames/ghidra-firmware-utils";

    downloadPage = "https://github.com/al3xtjames/ghidra-firmware-utils/releases/tag/${finalAttrs.version}";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ timschumi ];

  };

})