Unverified Commit eb26e06e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 597366a4 6f314053
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -15264,12 +15264,6 @@
    githubId = 496447;
    name = "Robert Hensing";
  };
  robert-manchester = {
    email = "robert.manchester@gmail.com";
    github = "robert-manchester";
    githubId = 86313040;
    name = "Robert Manchester";
  };
  robertodr = {
    email = "roberto.diremigio@gmail.com";
    github = "robertodr";
+2 −2
Original line number Diff line number Diff line
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
  pname = "lorien";
  version = "0.5.0";
  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "mbrlabs";
    repo = "Lorien";
    rev = "v${version}";
    sha256 = "sha256-x81Obana2BEGrYSoJHDdCkL6UaULfQGQ94tlrH5+kdY=";
    sha256 = "sha256-mPv/3hyLGF3IUy6cKfGoABidIsyw4UfmhfhS4AD72K8=";
  };

  nativeBuildInputs = [
+8 −8
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@
        version = "2023-09-12";
      };
    };
    hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
    hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
    version = "119.0.6045.105";
    hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA=";
    hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE=";
    version = "119.0.6045.123";
  };
  ungoogled-chromium = {
    deps = {
@@ -28,12 +28,12 @@
        version = "2023-09-12";
      };
      ungoogled-patches = {
        hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc=";
        rev = "119.0.6045.105-1";
        hash = "sha256-4EbfM62KuG8nHrYWwp183V5G9ac7FICjpyJahnKbQjE=";
        rev = "119.0.6045.123-1";
      };
    };
    hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA=";
    hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs=";
    version = "119.0.6045.105";
    hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA=";
    hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE=";
    version = "119.0.6045.123";
  };
}
+17 −10
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub
, readline, cmake
{ lib
, stdenv
, fetchFromGitHub
, readline
, cmake
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname   = "abc-verifier";
  version = "unstable-2023-09-13";
  version = "unstable-2023-10-13";

  src = fetchFromGitHub {
    owner = "yosyshq";
    repo  = "abc";
    rev   = "daad9ede0137dc58487a0abc126253e671a85b14";
    hash  = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ=";
    rev   = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43";
    hash  = "sha256-ou+E2lvDEOxXRXNygE/TyVi7quqk+CJHRI+HDI0xljE=";
  };

  nativeBuildInputs = [ cmake ];
  buildInputs = [ readline ];

  installPhase = "mkdir -p $out/bin && mv abc $out/bin";
  installPhase = ''
    runHook preInstall
    install -Dm755 'abc' "$out/bin/abc"
    runHook postInstall
  '';

  # needed by yosys
  passthru.rev = src.rev;
  passthru.rev = finalAttrs.src.rev;

  meta = with lib; {
    description = "A tool for squential logic synthesis and formal verification";
    homepage    = "https://people.eecs.berkeley.edu/~alanmi/abc";
    license     = licenses.mit;
    maintainers = with maintainers; [ thoughtpolice ];
    maintainers = with maintainers; [ thoughtpolice Luflosi ];
    mainProgram = "abc";
    platforms   = platforms.unix;
  };
}
})
+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@

buildGoModule rec {
  pname = "git-codereview";
  version = "1.7.0";
  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "review";
    rev = "v${version}";
    hash = "sha256-vq/rrDOZUn/apHgk6YPnfG7hmKRSapuw49ZyFVMWNqs=";
    hash = "sha256-E6KgFSlWa/MKG6R2P+K4T+P/JOqaIfxdWpsSFGHbihg=";
  };

  vendorHash = null;
Loading