Skip to content

Commit dfcebce

Browse files
committed
nix: update packaging & ci
test with eigen 3.4.1 & 5
1 parent 1b9f515 commit dfcebce

File tree

3 files changed

+23
-49
lines changed

3 files changed

+23
-49
lines changed

.github/workflows/nix.yml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,23 @@ jobs:
1313
runs-on: "${{ matrix.os }}"
1414
strategy:
1515
matrix:
16-
os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-15-intel", "macos-14"]
16+
os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-15-intel", "macos-15"]
17+
eigen: ["", "-eigen_5"]
1718
steps:
1819
- uses: actions/checkout@v6
1920
- uses: cachix/install-nix-action@v31
2021
- uses: cachix/cachix-action@v16
2122
with:
2223
name: gepetto
2324
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
24-
- run: nix build -L .#proxsuite
25-
26-
nix-eigen5:
27-
runs-on: "${{ matrix.os }}"
28-
strategy:
29-
matrix:
30-
os: ["ubuntu-24.04", "macos-15"]
31-
steps:
32-
- uses: actions/checkout@v6
33-
- uses: cachix/install-nix-action@v31
34-
- uses: cachix/cachix-action@v16
35-
with:
36-
name: gepetto
37-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
38-
- run: nix build -L .#proxsuite-eigen_5
25+
- run: nix build -L .#proxsuite${{ matrix.eigen }}
3926

4027
check:
4128
if: always()
4229
name: check-macos-linux-nix
4330

4431
needs:
4532
- nix
46-
- nix-eigen5
4733

4834
runs-on: Ubuntu-latest
4935

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,18 @@
3030
];
3131
};
3232
postPatch = "";
33-
nativeCheckInputs = [
34-
final.ctestCheckHook
35-
];
36-
# ref. https://github.com/Simple-Robotics/proxsuite/issues/426
37-
preCheck = ''
38-
disabledTests+=(
39-
"ProxQP::dense: test primal infeasibility solving"
40-
"dense maros meszaros using the api"
41-
"sparse maros meszaros using the API"
42-
)
43-
'';
4433
};
4534
};
46-
eigen5 = final: prev: {
47-
eigen = prev.eigen.overrideAttrs (super: rec {
48-
version = "5.0.0";
49-
src = final.fetchFromGitLab {
50-
inherit (super.src) owner repo;
51-
tag = version;
52-
hash = "sha256-L1KUFZsaibC/FD6abTXrT3pvaFhbYnw+GaWsxM2gaxM=";
53-
};
54-
patches = [ ];
55-
postPatch = "";
56-
});
35+
eigen_5 = final: prev: {
36+
eigen = final.eigen_5;
37+
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
38+
(python-final: python-prev: {
39+
scipy = python-prev.scipy.overrideAttrs {
40+
# broken on linux arm
41+
doInstallCheck = false;
42+
};
43+
})
44+
];
5745
};
5846
};
5947
perSystem =
@@ -73,7 +61,7 @@
7361
pkgs-eigen_5 = import inputs.nixpkgs {
7462
inherit system;
7563
overlays = [
76-
self.overlays.eigen5
64+
self.overlays.eigen_5
7765
self.overlays.default
7866
];
7967
};

0 commit comments

Comments
 (0)