From 9c23772cf25e0d891bef70b7bcb7df36239672a5 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 18 Jun 2024 22:29:20 -0700 Subject: [PATCH] Tidy and make it work on release-2.90 --- flake.lock | 24 +++++++++++------------- flake.nix | 4 ++-- meson.build | 5 +++++ src/meson.build | 8 ++++---- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index d5f0995..2270df4 100644 --- a/flake.lock +++ b/flake.lock @@ -47,17 +47,15 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1718228457, - "narHash": "sha256-vGumESUGu/jo2Lm5bha/xBsJKVlb1wuclXlL9xudRp4=", - "ref": "refs/heads/main", - "rev": "f46194faa2fc9c78250702c8eb7a4b756e0bd944", - "revCount": 15757, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "lastModified": 1718590005, + "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=", + "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz" }, "original": { - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz" } }, "nix-github-actions": { @@ -98,16 +96,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718132686, - "narHash": "sha256-JRinkq+FeAkYnrrK8+Bh+jtLHJBN5jDzSimk1ye00EE=", + "lastModified": 1718676691, + "narHash": "sha256-DWKbARWtRpT1yiLLm+5vMijx65YB7NwGZMV6NXOtrJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96b3dae4f8753c1f5ce0d06b57fe250fb5d9b0e0", + "rev": "d9e18354acbf59c625505b7315c85508e9831bf4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11-small", + "ref": "nixos-24.05-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e3a589b..5fdcfb4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Hydra's builtin hydra-eval-jobs as a standalone"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; inputs.flake-parts.url = "github:hercules-ci/flake-parts"; inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.treefmt-nix.url = "github:numtide/treefmt-nix"; @@ -9,7 +9,7 @@ inputs.nix-github-actions.url = "github:nix-community/nix-github-actions"; inputs.nix-github-actions.inputs.nixpkgs.follows = "nixpkgs"; inputs.lix = { - url = "git+https://git@git.lix.systems/lix-project/lix"; + url = "https://git.lix.systems/lix-project/lix/archive/release-2.90.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/meson.build b/meson.build index 60dfef7..15708a6 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,11 @@ project('nix-eval-jobs', 'cpp', version : '0.1.6', license : 'GPL-3.0', + default_options : [ + 'debug=true', + 'optimization=2', + 'cpp_std=c++20', + ], ) nix_main_dep = dependency('lix-main', required: true) diff --git a/src/meson.build b/src/meson.build index 745e036..4ece592 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,10 +1,10 @@ -src = [ +src = files( 'nix-eval-jobs.cc', 'eval-args.cc', 'drv.cc', 'buffered-io.cc', - 'worker.cc' -] + 'worker.cc', +) cc = meson.get_compiler('cpp') @@ -31,4 +31,4 @@ executable('nix-eval-jobs', src, threads_dep ], install: true, - cpp_args: ['-std=c++2a', '--include', 'autotools-config.h']) + cpp_args: ['--include', 'autotools-config.h'])