From fb761c1631d620ec85de10451f76aca18a8da788 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 26 Jun 2024 09:49:01 +0200
Subject: [PATCH] treefmt
---
.../manylinux2014/scripts/patch_whitelist.py | 2 +-
flake.lock | 69 +++++++++++++++++++
flake.nix | 57 ++++++++-------
scripts/robotpkg-test-rc.py | 1 +
4 files changed, 104 insertions(+), 25 deletions(-)
create mode 100644 flake.lock
diff --git a/docker/manylinux2014/scripts/patch_whitelist.py b/docker/manylinux2014/scripts/patch_whitelist.py
index 9d5e0f3..be739ea 100755
--- a/docker/manylinux2014/scripts/patch_whitelist.py
+++ b/docker/manylinux2014/scripts/patch_whitelist.py
@@ -1,6 +1,6 @@
#!/opt/_internal/tools/bin/python
"""
-Patch auditwheel whitelist: allow reuse of shared objects from our other wheels,
+Patch auditwheel whitelist: allow reuse of shared objects from our other wheels,
and generate a string for a RPATH update.
Folks at pypa won't allow that in their codebase, as it's ugly, but they don't forbid us to do so:
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..185e90c
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,69 @@
+{
+ "nodes": {
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1717285511,
+ "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1719254875,
+ "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "nixpkgs": "nixpkgs",
+ "treefmt-nix": "treefmt-nix"
+ }
+ },
+ "treefmt-nix": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1719243788,
+ "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 277e25f..f435101 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,34 +1,43 @@
{
- description = "Description for the project";
+ description = "Set of tools for the Gepetto Team";
inputs = {
- flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ flake-parts = {
+ url = "github:hercules-ci/flake-parts";
+ inputs.nixpkgs-lib.follows = "nixpkgs";
+ };
+ treefmt-nix = {
+ url = "github:numtide/treefmt-nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
};
- outputs = inputs@{ flake-parts, ... }:
+ outputs =
+ inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
- imports = [
- # To import a flake module
- # 1. Add foo to inputs
- # 2. Add foo as a parameter to the outputs function
- # 3. Add here: foo.flakeModule
-
+ imports = [ inputs.treefmt-nix.flakeModule ];
+ systems = [
+ "x86_64-linux"
+ "aarch64-linux"
+ "aarch64-darwin"
+ "x86_64-darwin"
];
- systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
- perSystem = { config, self', inputs', pkgs, system, ... }: {
- # Per-system attributes can be defined here. The self' and inputs'
- # module parameters provide easy access to attributes of the same
- # system.
-
- # Equivalent to inputs'.nixpkgs.legacyPackages.hello;
- packages.default = pkgs.hello;
- };
- flake = {
- # The usual flake attributes can be defined here, including system-
- # agnostic ones like nixosModule and system-enumerating ones, although
- # those are more easily expressed in perSystem.
-
- };
+ perSystem =
+ { config, pkgs, ... }:
+ {
+ devShells.default = pkgs.mkShell { nativeBuildInputs = [ config.treefmt.build.wrapper ]; };
+ treefmt = {
+ projectRootFile = "flake.nix";
+ programs = {
+ deadnix.enable = true;
+ nixfmt-rfc-style.enable = true;
+ ruff = {
+ check = true;
+ format = true;
+ };
+ };
+ };
+ };
};
}
diff --git a/scripts/robotpkg-test-rc.py b/scripts/robotpkg-test-rc.py
index cad0004..96d0aa9 100755
--- a/scripts/robotpkg-test-rc.py
+++ b/scripts/robotpkg-test-rc.py
@@ -2,6 +2,7 @@
"""
This script performs a few checkouts on branches on robotpkg, and then tries to compile and test everything
"""
+
import argparse
import logging
import os
--
GitLab