Skip to content

Update Nix to 26.05 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uulm-janbaudisch merged 2 commits into from
Jun 5, 2026
Merged

Update Nix to 26.05 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a562dc3
feat(nix): update to 26.05
uulm-janbaudisch May 29, 2026
2cd22f6
ci: pause broken windows build for now
uulm-janbaudisch Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/CI.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/GPMC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(GMPC VERSION 2.0.0 LANGUAGES CXX)

Expand Down
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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, ... }:
Expand Down Expand Up @@ -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 ]
Expand Down
4 changes: 2 additions & 2 deletions nix/mt-kahypar.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cmake,
git,
boost,
tbb_2022_0,
tbb_2022,
windows,
}:
let
Expand Down Expand Up @@ -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 = [
Expand Down
Loading