diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index d739905..975a9d8 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -27,10 +27,10 @@ jobs: system: x86_64-darwin runner: macos-26-intel flake: bundled - - double: x86_64-windows - system: x86_64-linux - runner: ubuntu-24.04 - flake: bundled-windows + # - double: x86_64-windows + # system: x86_64-linux + # runner: ubuntu-24.04 + # flake: bundled-windows runs-on: ${{ matrix.target.runner }} steps: - name: Checkout diff --git a/3rdParty/GPMC/CMakeLists.txt b/3rdParty/GPMC/CMakeLists.txt index 35373d4..54f1a72 100755 --- a/3rdParty/GPMC/CMakeLists.txt +++ b/3rdParty/GPMC/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(GMPC VERSION 2.0.0 LANGUAGES CXX) diff --git a/flake.lock b/flake.lock index f21f9b5..b8670cc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1779971959, + "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f04e989..bc0abee 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Packages and development environments for d4"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; outputs = { self, nixpkgs, ... }: @@ -34,7 +34,7 @@ paths = [ self.packages.${system}.${windowsSuffix' "mt-kahypar"} - pkgs.tbb_2022_0 + pkgs.tbb_2022 (boost pkgs) ] ++ lib.optionals pkgs.stdenv.cc.isGNU [ pkgs.libgcc ] diff --git a/nix/mt-kahypar.nix b/nix/mt-kahypar.nix index 711d3c7..4ca7ad6 100644 --- a/nix/mt-kahypar.nix +++ b/nix/mt-kahypar.nix @@ -5,7 +5,7 @@ cmake, git, boost, - tbb_2022_0, + tbb_2022, windows, }: let @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost.dev - tbb_2022_0.dev + tbb_2022.dev ] ++ lib.optionals stdenv.hostPlatform.isWindows [ windows.pthreads ]; patches = [