Merge master into staging-nixos
This commit is contained in:
@@ -18,16 +18,16 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "asusctl";
|
pname = "asusctl";
|
||||||
version = "6.1.14";
|
version = "6.1.15";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "asus-linux";
|
owner = "asus-linux";
|
||||||
repo = "asusctl";
|
repo = "asusctl";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-TMfuqtMaXklAEQjSxeYToszZ6foL0b7PTEdpBrAeIxY=";
|
hash = "sha256-ckazulETorMaYc860ELV/kABPv9+YF+EvpapNqNnXuI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-rJuFdBvypwPFCOUQ+34xDHTKYhrgJPaHng54oybN2Tk=";
|
cargoHash = "sha256-qryRfwffP+AiaFjZ6mw5GHI/xlV1EhOsdhJhJw6Zn74=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
files="
|
files="
|
||||||
|
|||||||
@@ -9,13 +9,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "brlaser";
|
pname = "brlaser";
|
||||||
version = "6.2.7";
|
version = "6.2.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Owl-Maintain";
|
owner = "Owl-Maintain";
|
||||||
repo = "brlaser";
|
repo = "brlaser";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-a+TjLmjqBz0b7v6kW1uxh4BGzrYOQ8aMdVo4orZeMT4=";
|
hash = "sha256-fE3mKGrYPvLl66gVJJJPc3P3rBJk695SP7+3exE5exw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
100
pkgs/by-name/lc/lctime/package.nix
Normal file
100
pkgs/by-name/lc/lctime/package.nix
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
{
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -13,13 +13,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "signaturepdf";
|
pname = "signaturepdf";
|
||||||
version = "1.9.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "24eme";
|
owner = "24eme";
|
||||||
repo = "signaturepdf";
|
repo = "signaturepdf";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-DLPLloSt9yMEWFqmplQ8WictanlwRc4oQbTEQLUxR+E=";
|
hash = "sha256-HKHlIsOdCeU1yYPQZJ+npz/MjKhWf7PZ4nfWxRUTEUc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|||||||
@@ -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 ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
@@ -37,7 +44,8 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Automatically identify anti-patterns in SQL queries";
|
description = "Automatically identify anti-patterns in SQL queries";
|
||||||
mainProgram = "sqlcheck";
|
mainProgram = "sqlcheck";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = platforms.all;
|
platforms = with platforms; unix ++ windows;
|
||||||
maintainers = [ ];
|
broken = stdenv.hostPlatform.isDarwin;
|
||||||
|
maintainers = with maintainers; [ h7x4 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
65
pkgs/development/python-modules/liberty-parser/default.nix
Normal file
65
pkgs/development/python-modules/liberty-parser/default.nix
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchFromGitea,
|
||||||
|
setuptools,
|
||||||
|
lark,
|
||||||
|
numpy,
|
||||||
|
sympy,
|
||||||
|
pytestCheckHook,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "liberty-parser";
|
||||||
|
version = "0.0.25";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitea {
|
||||||
|
domain = "codeberg.org";
|
||||||
|
owner = "tok";
|
||||||
|
repo = "liberty-parser";
|
||||||
|
tag = version;
|
||||||
|
hash = "sha256-Nl+FRG93DeP1ctDphaTKZqkukEywmGprj6JORJQTunw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Tests try to write to /tmp directly. use $TMPDIR instead.
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace src/liberty/parser.py \
|
||||||
|
--replace-fail "/tmp" "$TMPDIR"
|
||||||
|
'';
|
||||||
|
|
||||||
|
build-system = [
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
lark
|
||||||
|
numpy
|
||||||
|
sympy
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
enabledTestPaths = [
|
||||||
|
"src/liberty/*.py"
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"liberty.parser"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Liberty parser for Python";
|
||||||
|
homepage = "https://codeberg.org/tok/liberty-parser";
|
||||||
|
license = with lib.licenses; [
|
||||||
|
asl20
|
||||||
|
cc-by-sa-40
|
||||||
|
cc0
|
||||||
|
gpl3Plus
|
||||||
|
];
|
||||||
|
maintainers = with lib.maintainers; [ eljamm ];
|
||||||
|
teams = with lib.teams; [ ngi ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -8241,6 +8241,8 @@ self: super: with self; {
|
|||||||
|
|
||||||
libear = callPackage ../development/python-modules/libear { };
|
libear = callPackage ../development/python-modules/libear { };
|
||||||
|
|
||||||
|
liberty-parser = callPackage ../development/python-modules/liberty-parser { };
|
||||||
|
|
||||||
libevdev = callPackage ../development/python-modules/libevdev { };
|
libevdev = callPackage ../development/python-modules/libevdev { };
|
||||||
|
|
||||||
libfdt = toPythonModule (
|
libfdt = toPythonModule (
|
||||||
|
|||||||
Reference in New Issue
Block a user