Skip to content

Commit

Permalink
chore(deps): bump nix flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Sep 27, 2024
1 parent 0388258 commit c16d72c
Show file tree
Hide file tree
Showing 59 changed files with 5,178 additions and 4,508 deletions.
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions overrides/build-systems.json
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,9 @@
"cython_0",
"setuptools"
],
"apache-flink": [
"setuptools"
],
"apache-flink-libraries": [
"setuptools"
],
Expand Down Expand Up @@ -5869,6 +5872,7 @@
"setuptools"
],
"docopt-ng": [
"pdm-backend",
"setuptools"
],
"docplex": [
Expand Down Expand Up @@ -15470,6 +15474,9 @@
"hatchling",
"setuptools"
],
"pemja": [
"setuptools"
],
"pencompy": [
"setuptools"
],
Expand Down Expand Up @@ -23997,6 +24004,9 @@
"poetry-core",
"setuptools"
],
"textual-serve": [
"hatchling"
],
"textual-textarea": [
"poetry-core",
"setuptools"
Expand Down
33 changes: 31 additions & 2 deletions overrides/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@ lib.composeManyExtensions [
{ }
{
mpi = {
mpicc = "${pkgs.mpi.dev}/bin/mpicc";
mpicc = "${lib.getDev pkgs.mpi}/bin/mpicc";
};
};
};
Expand Down Expand Up @@ -1863,6 +1863,8 @@ lib.composeManyExtensions [
];
buildInputs = old.buildInputs or [ ] ++ [
pkgs.libusb1
pkgs.xorg.libXfixes
pkgs.xorg.libXxf86vm
] ++ lib.optionals stdenv.isLinux [
pkgs.udev
] ++ lib.optionals (lib.versionAtLeast prev.open3d.version "0.16.0" && !pkgs.mesa.meta.broken) [
Expand Down Expand Up @@ -2251,6 +2253,33 @@ lib.composeManyExtensions [
}
);

pemja = prev.pemja.overridePythonAttrs (old: {
buildInputs = old.buildInputs or [ ] ++ [ pkgs.openjdk17_headless ];
});

pycrdt =
let
hashes = {
"0.9.11" = "sha256-qKrYCkSP8f/oQytfc1xvBX6gt26D3Z/5bbzKPO0e0tQ=";
};
in
prev.pycrdt.overridePythonAttrs (old: {
cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
inherit (old) src;
name = "${old.pname}-${old.version}";
sha256 = hashes.${old.version};
};

buildInputs = old.buildInputs or [ ] ++ lib.optionals stdenv.isDarwin [
pkgs.libiconv
];

nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
pkgs.rustPlatform.cargoSetupHook
pkgs.rustPlatform.maturinBuildHook
];
});

pycurl = prev.pycurl.overridePythonAttrs (
old: {
buildInputs = old.buildInputs or [ ] ++ [ pkgs.curl ];
Expand Down Expand Up @@ -3887,7 +3916,7 @@ lib.composeManyExtensions [

getCargoHash = version: {
"0.24.0".outputHashes = {
"notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I=";
"notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I=";
};
"0.23.0" = "sha256-m7XFpbujWFmDNSDydY3ec6b+AGgrfo3+TTbRN7te8bY=";
"0.22.0" = "sha256-pl5BBOxrxvPvBJTnTqvWNFecoJwfyuAs4xZEgmg+T+w=";
Expand Down
39 changes: 37 additions & 2 deletions tests/aiopath/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion tests/aiopath/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ authors = ["Your Name <[email protected]>"]
python = "^3.8"
aiopath = [
{ version = "0.5.12", python = ">=3.7,<3.10" },
{ version = ">0.5.12,<0.7", python = ">=3.10,<3.11" }
{ version = ">=0.6,<0.7", python = ">=3.10,<3.11" },
{ version = ">=0.7,<1", python = ">=3.12,<4" },
]

[build-system]
Expand Down
Loading

0 comments on commit c16d72c

Please sign in to comment.