lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
29259d4e 1460b5f7

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