gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2025-01-02 06:05:01 +00:00
committed by GitHub
parent 3729f2c855 ce6566efb4
commit ee6bd66be7
19 changed files with 110 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/electronics/openroad/default.nix
+15 -8
View File
@@ -15,6 +15,7 @@
clp, # for or-tools
cudd,
eigen,
gtest,
glpk,
lcov,
lemon-graph,
@@ -43,22 +44,27 @@ let
in
mkDerivation rec {
pname = "openroad";
version = "2.0-unstable-2024-12-22";
version = "2.0-unstable-2024-12-31";
src = fetchFromGitHub {
owner = "The-OpenROAD-Project";
repo = "OpenROAD";
rev = "51302eb80b11576a01171d33452c362301d55143";
rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9";
fetchSubmodules = true;
hash = "sha256-xFeZo6GjKKee7fTrzN4TNNL8eeTDJXyQGPkIKU/WvIc=";
hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o=";
};
patches = [
./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451
];
nativeBuildInputs = [
bison
cmake
doxygen
flex
git
gtest
pkg-config
swig
];
@@ -95,15 +101,13 @@ mkDerivation rec {
patchShebangs --build etc/find_messages.py
'';
# Enable output images from the placer.
cmakeFlags = [
# Tries to download gtest 1.13 as part of the build. We currently rely on
# the regression tests so we can get by without building unit tests.
"-DENABLE_TESTS=OFF"
"-DENABLE_TESTS=ON"
"-DUSE_SYSTEM_BOOST=ON"
"-DUSE_SYSTEM_ABC=OFF"
"-DUSE_SYSTEM_OPENSTA=OFF"
"-DOPENROAD_VERSION=${src.rev}"
"-DOPENROAD_VERSION=${version}_${src.rev}"
"-DCMAKE_RULE_MESSAGES=OFF"
"-DTCL_LIBRARY=${tcl}/lib/libtcl.so"
"-DTCL_HEADER=${tcl}/include/tcl.h"
];
@@ -115,6 +119,9 @@ mkDerivation rec {
# to see if there are any breaking changes in unstable that should be vendored as well.
doCheck = true;
checkPhase = ''
# Disable two tests that are failing curently.
sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake
make test
../test/regression
'';
pkgs/applications/science/electronics/openroad/swig43-compat.patch
+30
View File
@@ -0,0 +1,30 @@
diff --git a/src/odb/src/swig/python/dbtypes.i b/src/odb/src/swig/python/dbtypes.i
index 37305d55e..d85f2915e 100644
--- a/src/odb/src/swig/python/dbtypes.i
+++ b/src/odb/src/swig/python/dbtypes.i
@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*");
for(std::vector<odb::dbShape>::iterator it = $1->begin(); it != $1->end(); it++) {
PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0);
- $result = SWIG_Python_AppendOutput($result, o);
+ $result = SWIG_Python_AppendOutput($result, o, 0);
}
}
@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return)
auto layer = it->second;
PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0);
PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig);
- $result = SWIG_Python_AppendOutput($result, tuple);
+ $result = SWIG_Python_AppendOutput($result, tuple, 0);
}
}
%typemap(argout) std::vector<int> &OUTPUT {
for(auto it = $1->begin(); it != $1->end(); it++) {
PyObject *obj = PyInt_FromLong((long)*it);
- $result = SWIG_Python_AppendOutput($result, obj);
+ $result = SWIG_Python_AppendOutput($result, obj, 0);
}
}
pkgs/by-name/an/antora-lunr-extension/package.nix
+1 -1
View File
@@ -10,10 +10,10 @@ buildNpmPackage rec {
version = "1.0.0-alpha.8";
src = fetchFromGitLab {
hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
owner = "antora";
repo = pname;
rev = "v${version}";
hash = "sha256-GplCwhUl8jurD4FfO6/T3Vo1WFjg+rtAjWeIh35unk4=";
};
npmDepsHash = "sha256-EtjZL6U/uSGSYSqtuatCkdWP0NHxRuht13D9OaM4x00=";
pkgs/by-name/an/antora-ui-default/package.nix
+1 -1
View File
@@ -5,10 +5,10 @@
}:
let
srcFetchFromGitLab = {
hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM=";
owner = "trueNAHO";
repo = "antora-ui-default";
rev = "11f563294248e9b64124b9289d639e349f2e9f5f";
hash = "sha256-gUQLLjnWZ1OsAe005IOPIfoM0qmjoevcUuGBRD3oHXA=";
};
in
stdenvNoCC.mkDerivation {
pkgs/by-name/bo/bonsai/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bonsai";
version = "1.2.0";
version = "1.2.1";
src = fetchFromSourcehut {
owner = "~stacyharper";
repo = "bonsai";
rev = "v${finalAttrs.version}";
hash = "sha256-Ggk+OKaRE+kVa8/ij3znuY3b0dT2F5F1CSse4l0MAA8=";
hash = "sha256-WAne0628lELQanUv2lg8Y9QEikZVAT7Xtkndhs8Ozjw=";
};
nativeBuildInputs = [
pkgs/by-name/db/dbip-asn-lite/package.nix
+2 -2
View File
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-asn-lite";
version = "2024-12";
version = "2025-01";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-tzeXJzgTG6AB46dCYqtdECqMm2nh9PfPigMvRif2+cM=";
hash = "sha256-cRlhlP5ml+swBZGiLpVH5s7nvPiHUi7qxM2GajoeK+Y=";
};
dontUnpack = true;
pkgs/by-name/db/dbip-city-lite/package.nix
+2 -2
View File
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-city-lite";
version = "2024-12";
version = "2025-01";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-IkZ6d9CP+AgYXaWmQTfTz2MTHEV7h/f1HiOAGXxBH+g=";
hash = "sha256-fBS2JASkZaLNCjNAadNkrctixTkDvpkTUYP0yUHBXnw=";
};
dontUnpack = true;
pkgs/by-name/db/dbip-country-lite/package.nix
+2 -2
View File
@@ -5,11 +5,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-country-lite";
version = "2024-12";
version = "2025-01";
src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-58g4ch1N1vPPymYx6M7X3Q6l6Sbr5GkEXv/Vi7K9Ivk=";
hash = "sha256-PVpqo1t6V0kdVqA1aEgU0UqwhzmLLMHYB6gyoMusVv8=";
};
dontUnpack = true;
pkgs/by-name/ec/ecapture/package.nix
+3 -3
View File
@@ -21,13 +21,13 @@
buildGoModule rec {
pname = "ecapture";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
tag = "v${version}";
hash = "sha256-ucauZ1nvsiNxeqMcMHbUaKidAGF/XW7hi04W+Bv6I6Q=";
hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0=";
fetchSubmodules = true;
};
@@ -106,7 +106,7 @@ buildGoModule rec {
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E=";
vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M=";
passthru.updateScript = nix-update-script { };
pkgs/by-name/ha/harper/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "harper";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "elijah-potter";
repo = "harper";
rev = "v${version}";
hash = "sha256-X1mTqaqOqeAM7mq3nNrE2ULZ1zaAxZIqp0p1wdlDwgk=";
hash = "sha256-YKfhvwm8TuKpM81qcVgL15AdiQaI7PXvRq1pWThwmo0=";
};
cargoHash = "sha256-0RJ0Kpht4gqZTBdjld1Wi5r9FN5RB74KboxODmlHoko=";
cargoHash = "sha256-Gf0GJVWefZlMXpnJytAdmM/I9y7bXoCilUZs/HK0Vdw=";
meta = {
description = "Grammar Checker for Developers";
pkgs/by-name/mi/mieru/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.9.0";
version = "3.10.0";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-59TWABRIH3FEOyLvZ+jn7b3jhI0comjU4Mrl4Ggx2eA=";
hash = "sha256-4uJi8+kpVBjigTkLmV9fL0igmcOt5Gb40qkQHYR8kCU=";
};
vendorHash = "sha256-hSTKhn39xKZx1N9x66EH/ql4oP4qn0eysGTbUk9mRAk=";
pkgs/by-name/op/openturns/package.nix
+2 -2
View File
@@ -29,13 +29,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openturns";
version = "1.23";
version = "1.24";
src = fetchFromGitHub {
owner = "openturns";
repo = "openturns";
rev = "v${finalAttrs.version}";
hash = "sha256-csl5cZvxU8fdLKvh04ZWKizClrHqF79c7tAMSejo2lk=";
hash = "sha256-88wxgifLuF/P/qeMLVP0S5Agutf022Dsysu38mh9+8w=";
};
nativeBuildInputs = [
pkgs/by-name/si/sirikali/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "sirikali";
version = "1.7.2";
version = "1.8.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "sirikali";
rev = version;
hash = "sha256-UtgK+q06J6T6RJ8jQiwzg5yVtgGZaZzmfadNyXxTCIk=";
hash = "sha256-zEiX0eAsmfWDXehxetkqXbdXhB53DE5LDyglMBijckI=";
};
buildInputs =
pkgs/by-name/st/streamlink/package.nix
+2 -3
View File
@@ -8,12 +8,12 @@
python3Packages.buildPythonApplication rec {
pname = "streamlink";
version = "7.0.0";
version = "7.1.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-UaQGKGLmeV1pQEbKbnBUnW0TWDxkDRUFlmgEsOA/7/I=";
hash = "sha256-wYge0LulNhLZedmpGLfewFb8k80gKlsHoIDlVo29q0w=";
};
patches = [
@@ -50,7 +50,6 @@ python3Packages.buildPythonApplication rec {
requests
trio
trio-websocket
typing-extensions
urllib3
websocket-client
];
pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+2 -2
View File
@@ -9,12 +9,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20241210004721";
version = "20241221105938";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-CiIjD6hI2rdulK/rqViLqB2YotpHd5ftOOxJncIcYS4=";
hash = "sha256-k42qnHQY9bfSjyGGtaqKdIxlvU/C7TiN8sD0AiRQmVU=";
};
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
meta = with lib; {
pkgs/development/beam-modules/elixir-ls/default.nix
+3 -3
View File
@@ -11,12 +11,12 @@
let
pname = "elixir-ls";
version = "0.25.0";
version = "0.26.1";
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v${version}";
hash = "sha256-7Lrv62R0otFPAfUAip1H4VcnBaV4QyDZkcBZTW7yq8I=";
hash = "sha256-fGjHDzQUBROFlv+AIzArRv+Q7RWPTizMFyYXQJGQzjA=";
};
in
mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
hash = "sha256-yR2ttnrtYcWFotBMIfOLmJzEO9NKy3SqiKJZ4mmlkdA=";
hash = "sha256-EUWySBI082cNXbHZKQKEisXffe0/UpupNcHj1GT7Mek=";
};
# elixir-ls is an umbrella app
pkgs/development/python-modules/ifcopenshell/default.nix
+17 -2
View File
@@ -8,13 +8,14 @@
pytestCheckHook,
# fetchers
fetchFromGitHub,
fetchpatch,
gitUpdater,
# build tools
cmake,
swig,
# native dependencies
eigen,
boost179,
boost,
cgal,
gmp,
hdf5,
@@ -65,6 +66,20 @@ buildPythonPackage rec {
hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
};
patches = [
(fetchpatch {
name = "ifcopenshell-boost-1.86-mt19937.patch";
url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/1fe168d331123920eeb9a96e542fcc1453de57fe.patch";
hash = "sha256-oZDEL8cPcEu83lW+qSvCbmDGYpaNNRrptW9MLu2pN70=";
})
(fetchpatch {
name = "ifcopenshell-boost-1.86-json.patch";
url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/88b861737c7c206d0e7307f90d37467e9585515c.patch";
hash = "sha256-zMoQcBWRdtavL0xdsr53SqyG6CZoeon8/mmJhrw85lc=";
})
];
nativeBuildInputs = [
# c++
cmake
@@ -77,7 +92,7 @@ buildPythonPackage rec {
buildInputs = [
# ifcopenshell needs stdc++
(lib.getLib stdenv.cc.cc)
boost179
boost
cgal
eigen
gmp
pkgs/development/python-modules/loguru/default.nix
+17 -12
View File
@@ -3,37 +3,42 @@
stdenv,
buildPythonPackage,
colorama,
exceptiongroup,
fetchFromGitHub,
flit-core,
freezegun,
pytest-mypy-plugins,
pytest-xdist,
pytestCheckHook,
pythonOlder,
pytest-xdist,
}:
buildPythonPackage rec {
pname = "loguru";
version = "0.7.2";
format = "setuptools";
version = "0.7.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Delgan";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw=";
tag = version;
hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4=";
};
build-system = [ flit-core ];
nativeCheckInputs = [
pytestCheckHook
pytest-xdist # massive speedup, not tested by upstream
colorama
freezegun
];
pytest-mypy-plugins
] ++ lib.optional (pythonOlder "3.10") exceptiongroup;
disabledTestPaths = [
"tests/test_type_hinting.py" # avoid dependency on mypy
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ];
disabledTests =
[
@@ -52,12 +57,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "loguru" ];
meta = with lib; {
meta = {
description = "Python logging made (stupidly) simple";
homepage = "https://github.com/Delgan/loguru";
changelog = "https://github.com/delgan/loguru/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
jakewaksbaum
rmcgibbo
];
pkgs/top-level/python-packages.nix
+2 -2
View File
@@ -13191,7 +13191,7 @@ self: super: with self; {
python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
boost = pkgs.boost182.override {
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};
@@ -13830,7 +13830,7 @@ self: super: with self; {
rdflib = callPackage ../development/python-modules/rdflib { };
rdkit = callPackage ../development/python-modules/rdkit {
boost = pkgs.boost182.override {
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};