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

Merge master into staging-nixos

parents 1a2d5b6f 886babdb
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -18,16 +18,16 @@
}:
rustPlatform.buildRustPackage rec {
  pname = "asusctl";
  version = "6.1.14";
  version = "6.1.15";

  src = fetchFromGitLab {
    owner = "asus-linux";
    repo = "asusctl";
    tag = version;
    hash = "sha256-TMfuqtMaXklAEQjSxeYToszZ6foL0b7PTEdpBrAeIxY=";
    hash = "sha256-ckazulETorMaYc860ELV/kABPv9+YF+EvpapNqNnXuI=";
  };

  cargoHash = "sha256-rJuFdBvypwPFCOUQ+34xDHTKYhrgJPaHng54oybN2Tk=";
  cargoHash = "sha256-qryRfwffP+AiaFjZ6mw5GHI/xlV1EhOsdhJhJw6Zn74=";

  postPatch = ''
    files="
+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@

stdenv.mkDerivation rec {
  pname = "brlaser";
  version = "6.2.7";
  version = "6.2.8";

  src = fetchFromGitHub {
    owner = "Owl-Maintain";
    repo = "brlaser";
    tag = "v${version}";
    hash = "sha256-a+TjLmjqBz0b7v6kW1uxh4BGzrYOQ8aMdVo4orZeMT4=";
    hash = "sha256-fE3mKGrYPvLl66gVJJJPc3P3rBJk695SP7+3exE5exw=";
  };

  nativeBuildInputs = [
+100 −0
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  python3Packages,
  fetchFromGitea,
  runCommand,
  lctime,
  ngspice,
  writableTmpDirAsHomeHook,
}:

python3Packages.buildPythonApplication rec {
  pname = "lctime";
  version = "0.0.26";
  pyproject = true;

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "librecell";
    repo = "lctime";
    tag = version;
    hash = "sha256-oNmeV8r1dtO2y27jAJnlx4mKGjhzL07ad2yBdOLwgF0=";
  };

  build-system = with python3Packages; [
    setuptools
  ];

  dependencies = with python3Packages; [
    joblib
    klayout
    liberty-parser
    matplotlib
    networkx
    numpy
    pyspice
    scipy
    sympy
  ];

  nativeCheckInputs = with python3Packages; [
    pytestCheckHook
    ngspice
  ];

  enabledTestPaths = [
    "src/lctime/*/*.py"
  ];

  disabledTestPaths = [
    # hangs indefinitely
    "src/lctime/characterization/test_ngspice_subprocess.py::test_ngspice_interactive_simple"
    "src/lctime/characterization/test_ngspice_subprocess.py::test_ngspice_subprocess_class"
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # causes python to abort
    "src/lctime/characterization/test_ngspice_subprocess.py::test_simple_simulation"
    # broken pipe
    "src/lctime/characterization/test_ngspice_subprocess.py::test_interactive_subprocess"
  ];

  pythonImportsCheck = [
    "lctime"
  ];

  passthru = {
    tests =
      runCommand "lctime-tests"
        {
          nativeBuildInputs = [
            lctime
            ngspice
            writableTmpDirAsHomeHook
          ];
        }
        ''
          cd "$HOME"

          cp -R "${src}/tests/"* .
          patchShebangs *.sh

          mkdir -p $out
          ./run_tests.sh &> $out/result.log
        '';
  };

  meta = {
    description = "Characterization tool for CMOS digital standard-cells";
    homepage = "https://codeberg.org/librecell/lctime";
    license = with lib.licenses; [
      agpl3Plus
      asl20
      cc-by-sa-40
      cc0
    ];
    maintainers = with lib.maintainers; [ eljamm ];
    teams = with lib.teams; [ ngi ];
    mainProgram = "lctime";
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@

stdenv.mkDerivation rec {
  pname = "signaturepdf";
  version = "1.9.0";
  version = "1.9.1";

  src = fetchFromGitHub {
    owner = "24eme";
    repo = "signaturepdf";
    rev = "v${version}";
    hash = "sha256-DLPLloSt9yMEWFqmplQ8WictanlwRc4oQbTEQLUxR+E=";
    hash = "sha256-HKHlIsOdCeU1yYPQZJ+npz/MjKhWf7PZ4nfWxRUTEUc=";
  };

  nativeBuildInputs = [ makeWrapper ];
+10 −2
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
    })
  ];

  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace-fail "cmake_minimum_required(VERSION 2.8 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
    substituteInPlace external/gflags/CMakeLists.txt \
      --replace-fail "cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
  '';

  nativeBuildInputs = [ cmake ];

  doCheck = true;
@@ -37,7 +44,8 @@ stdenv.mkDerivation rec {
    description = "Automatically identify anti-patterns in SQL queries";
    mainProgram = "sqlcheck";
    license = licenses.asl20;
    platforms = platforms.all;
    maintainers = [ ];
    platforms = with platforms; unix ++ windows;
    broken = stdenv.hostPlatform.isDarwin;
    maintainers = with maintainers; [ h7x4 ];
  };
}
Loading