Convert to Nix flakes and updates some of the dependencies

Author: arximboldi

.dir-locals.el

@@ -1,7 +1,11 @@
-((nil .
-      ((indent-tabs-mode . nil)
-       (show-trailing-whitespace . t)))
- (c-mode .
-         ((mode . c++)))
- (c++-mode .
-          ((eval add-hook 'before-save-hook #'clang-format-buffer nil t))))
+((nil
+  . ((indent-tabs-mode . nil)
+     (show-trailing-whitespace . t)))
+ (c-mode
+  . ((mode . c++)))
+ (c++-mode
+  . ((eval add-hook 'before-save-hook #'clang-format-buffer nil t)))
+ (nix-mode
+  . ((mode . nixfmt-on-save)))
+ (cmake-mode
+  . ((eval add-hook 'before-save-hook #'cmake-format-buffer nil t))))

.envrc

@@ -0,0 +1,2 @@
+DEV_SHELL=${DEV_SHELL:-default}
+use flake ".#${DEV_SHELL}"

.github/workflows/test.yml

@@ -1,93 +1,81 @@
 name: test
 on: [push, pull_request]
 jobs:
-  build:
+
+  nix-matrix:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
-        with:
-          name: arximboldi
-          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-      - run: nix-build
+      - id: set-matrix
+        name: Generate Nix Matrix
+        run: |
+          set -Eeu
+          matrix="$(nix eval --json '.#githubActions.matrix')"
+          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
 
-  macos:
-    runs-on: macos-latest
+  build-nix:
+    name: "nix: ${{ matrix.name }} (${{ matrix.system }})"
+    needs: nix-matrix
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v16
         with:
           name: arximboldi
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-      - run: nix-shell --run 'mkdir build-mac'
-      - name: configure cmake
-        run: |
-          nix-shell --run "
-            cd build-mac && cmake .. \
-              -DCMAKE_BUILD_TYPE=Debug
-          "
-      - run: nix-shell --run "cd build-mac && make check -j`nproc`"
+      - run: nix build -L '.#${{ matrix.attr }}'
 
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v16
         with:
           name: arximboldi
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-      - run: nix-shell --run "mkdir build"
-      - run: nix-shell --run "cd build && cmake .."
-      - run: nix-shell --run "cd build && make docs"
+      - run: nix develop --command cmake -B build
+      - run: nix develop --command make -C build docs
       - uses: shimataro/ssh-key-action@v2
         if: github.repository_owner == 'arximboldi' && github.ref == 'refs/heads/master'
         with:
           key: ${{ secrets.SINUSOIDES_SSH_KEY }}
           known_hosts: ${{ secrets.SINUSOIDES_KNOWN_HOSTS }}
-      - run: nix-shell --run "cd build && make upload-docs"
+      - run: nix develop --command make -C build upload-docs
         if: github.repository_owner == 'arximboldi' && github.ref == 'refs/heads/master'
 
   check:
     strategy:
       matrix:
         type: [Debug, Release]
-        compiler: [gcc]
+        toolchain: [gnu, llvm]
         opts: [[]]
         include:
           - type: Debug
-            compiler: gcc
+            toolchain: gnu
             opts: ['coverage']
-          - type: Debug
-            compiler: clang
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
+      - uses: cachix/cachix-action@v16
         with:
           name: arximboldi
           signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-      - run: nix-shell --argstr compiler ${{ matrix.compiler }} --run "mkdir build"
       - name: configure cmake
         run: |
-          nix-shell --argstr compiler ${{ matrix.compiler }} --run "
-            cd build && cmake -GNinja .. \
+          nix develop .#${{ matrix.toolchain }} --command \
+            cmake -B build -G Ninja \
               -DCMAKE_BUILD_TYPE=${{ matrix.type }} \
               -DENABLE_COVERAGE=${{ contains(matrix.opts, 'coverage') }}
-          "
-      - run: nix-shell --argstr compiler ${{ matrix.compiler }} --run "cd build && ninja check"
-      - run: nix-shell --argstr compiler ${{ matrix.compiler }} --run "bash <(curl -s https://codecov.io/bash)"
+      - run: nix develop .#${{ matrix.toolchain }} --command ninja -C build check
+      - run: nix develop .#${{ matrix.toolchain }} --command bash -c "bash <(curl -s https://codecov.io/bash)"
         if: ${{ contains(matrix.opts, 'coverage') }}

.gitignore

@@ -15,3 +15,4 @@ doc/_doxygen
 tools/travis/ssh-key
 *.qmlc
 /.vs
+.direnv/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0048 NEW) # enable project VERSION
 cmake_policy(SET CMP0056 NEW) # honor link flags in try_compile()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -87,7 +87,7 @@ install(TARGETS lager EXPORT LagerConfig)
 
 # requirements for tests and examples
 if (lager_BUILD_TESTS OR lager_BUILD_EXAMPLES)
-  find_package(Boost 1.56 COMPONENTS system REQUIRED)
+  find_package(Boost 1.56 CONFIG COMPONENTS system REQUIRED)
   find_package(Threads REQUIRED)
   find_package(Immer REQUIRED)
   find_package(Zug REQUIRED)

default.nix

@@ -1,42 +1,27 @@
-with import <nixpkgs> {};
+{
+  flake ? import ./nix/flake-compat.nix { },
+  pkgs ? import flake.inputs.nixpkgs { },
+}:
 
 let
-  deps = import ./nix/deps.nix {};
+  inherit (pkgs) lib;
+  inherit (import flake.inputs.gitignore { inherit lib; })
+    gitignoreSource
+    ;
+
+  nixFilter = name: type: !(lib.hasSuffix ".nix" name);
+  srcFilter =
+    src:
+    lib.cleanSourceWith {
+      filter = nixFilter;
+      src = gitignoreSource src;
+    };
+
+  immer = (import flake.inputs.immer { inherit pkgs; }).packages.${pkgs.system}.default;
+  zug = (import flake.inputs.zug { inherit pkgs; }).packages.${pkgs.system}.default;
+
 in
-stdenv.mkDerivation rec {
-  name = "lager-git";
-  version = "git";
-  src = builtins.filterSource (path: type:
-            baseNameOf path != ".git" &&
-            baseNameOf path != "build" &&
-            baseNameOf path != "_build" &&
-            baseNameOf path != "reports" &&
-            baseNameOf path != "tools")
-            ./.;
-  buildInputs = [
-    ncurses
-    SDL2
-    SDL2_ttf
-  ];
-  nativeBuildInputs = [
-    cmake
-    gcc7
-    sass
-    pkgs.pkg-config or pkgs.pkgconfig
-  ];
-  cmakeFlags = [
-    "-Dlager_BUILD_TESTS=OFF"
-    "-Dlager_BUILD_EXAMPLES=OFF"
-  ];
-  propagatedBuildInputs = [
-    boost
-    deps.cereal
-    deps.immer
-    deps.zug
-  ];
-  meta = {
-    homepage    = "https://github.com/arximboldi/lager";
-    description = "library for functional interactive c++ programs";
-    license     = lib.licenses.mit;
-  };
+pkgs.callPackage ./nix/lager.nix {
+  sources = srcFilter ./.;
+  inherit immer zug;
 }

example/CMakeLists.txt

@@ -110,7 +110,7 @@ find_package(Qt5Gui)
 find_package(Qt5Widgets)
 find_package(Qt5QuickControls2)
 
-find_package(Boost 1.56)
+find_package(Boost 1.56 CONFIG)
 
 if (Qt5Core_FOUND AND Qt5Concurrent_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Qml_FOUND AND Qt5QuickControls2_FOUND AND Boost_FOUND)
   add_executable(todo-qml EXCLUDE_FROM_ALL

example/counter/ncurses/main.cpp

@@ -32,7 +32,7 @@ void draw(const counter::model& c)
     static const auto instructions = "  arrow up   -- decrease counter\n"
                                      "  arrow down -- increase counter\n"
                                      "  space bar  -- reset counter";
-    auto message = prelude + std::to_string(c.value);
+    auto message                   = prelude + std::to_string(c.value);
     auto max_x = 0, max_y = 0;
     getmaxyx(stdscr, max_y, max_x);
     const auto border_y = 2, border_x = 4;
@@ -58,7 +58,7 @@ void draw(const counter::model& c)
 
 int main(int argc, const char** argv)
 {
-    auto serv = boost::asio::io_service{};
+    auto serv = boost::asio::io_context{};
     auto term = ncurses::terminal{serv};
     ::init_pair(1, COLOR_WHITE, COLOR_GREEN);
     ::init_pair(2, COLOR_WHITE, COLOR_RED);

example/counter/ncurses/terminal.cpp

@@ -21,7 +21,7 @@ using namespace std::string_literals;
 
 namespace ncurses {
 
-terminal::terminal(boost::asio::io_service& serv)
+terminal::terminal(boost::asio::io_context& serv)
     : win_{[] {
         std::locale::global(std::locale(""));
         ::setlocale(LC_ALL, "");

example/counter/ncurses/terminal.hpp

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/posix/stream_descriptor.hpp>
 #include <boost/asio/signal_set.hpp>
 
@@ -59,7 +59,7 @@ struct terminal
 {
     using event_handler = std::function<void(event)>;
 
-    terminal(boost::asio::io_service& serv);
+    terminal(boost::asio::io_context& serv);
 
     coord size();