From 8d63444fbae0380f74e1833fd8c4dad113fec1e5 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Tue, 19 Dec 2023 16:22:33 +0800 Subject: [PATCH] libnixf: remove flake.nix, flake.lock, shell.nix, and github workflows --- libnixf/.github/workflows/meson-build.yml | 56 -------------------- libnixf/.github/workflows/nix-build.yml | 18 ------- libnixf/flake.lock | 64 ----------------------- libnixf/flake.nix | 37 ------------- libnixf/shell.nix | 3 -- 5 files changed, 178 deletions(-) delete mode 100644 libnixf/.github/workflows/meson-build.yml delete mode 100644 libnixf/.github/workflows/nix-build.yml delete mode 100644 libnixf/flake.lock delete mode 100644 libnixf/flake.nix delete mode 100644 libnixf/shell.nix diff --git a/libnixf/.github/workflows/meson-build.yml b/libnixf/.github/workflows/meson-build.yml deleted file mode 100644 index a9a37e6ea..000000000 --- a/libnixf/.github/workflows/meson-build.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Meson - -on: - [push, pull_request] - -jobs: - nix-build-develop-gcc: - runs-on: ubuntu-latest - timeout-minutes: 30 - strategy: - fail-fast: false - matrix: - # sanitizer: [ none, thread, undefined ] - sanitizer: [ none, undefined ] - buildtype: [ release, debug ] - ndebug: [ "true", "false" ] - - if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }} - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - run: nix develop --command meson setup build/ --buildtype=${{ matrix.buildtype }} -Db_sanitize=${{ matrix.sanitizer }} -Db_ndebug=${{ matrix.ndebug }} - - run: nix develop --command meson compile -C build - - run: nix develop --command meson test -C build - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: nix-build-develop-gcc-testlog-${{ matrix.sanitizer }}-${{ matrix.ndebug }}-${{ matrix.buildtype }} - path: build/meson-logs/testlog.txt - - nix-build-develop-clang: - runs-on: ubuntu-latest - timeout-minutes: 10 - strategy: - fail-fast: false - matrix: - sanitizer: [ none ] - buildtype: [ release, debug ] - ndebug: [ "true", "false" ] - - if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }} - steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - run: nix develop .#llvm --command env CXX=clang++ meson setup build/ --buildtype=${{ matrix.buildtype }} -Db_sanitize=${{ matrix.sanitizer }} -Db_ndebug=${{ matrix.ndebug }} - - run: nix develop .#llvm --command meson compile -C build - - run: nix develop .#llvm --command meson test -C build - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: nix-build-develop-clang-testlog-${{ matrix.sanitizer }}-${{ matrix.ndebug }}-${{ matrix.buildtype }} - path: build/meson-logs/testlog.txt diff --git a/libnixf/.github/workflows/nix-build.yml b/libnixf/.github/workflows/nix-build.yml deleted file mode 100644 index 9ad269cc3..000000000 --- a/libnixf/.github/workflows/nix-build.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Nix build - -on: - [push, pull_request] - -jobs: - flake-default: - strategy: - matrix: - os: [ ubuntu-latest ] - runs-on: ${{ matrix.os }} - steps: - - uses: cachix/install-nix-action@v22 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 - - name: Build flake - run: nix build -L #. diff --git a/libnixf/flake.lock b/libnixf/flake.lock deleted file mode 100644 index b139ab4ae..000000000 --- a/libnixf/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/libnixf/flake.nix b/libnixf/flake.nix deleted file mode 100644 index dcec003b2..000000000 --- a/libnixf/flake.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = { nixpkgs, flake-parts, ... }@inputs: flake-parts.lib.mkFlake { inherit inputs; } { - perSystem = { config, self', inputs', pkgs, system, ... }: - with pkgs; - let - llvmPackages = llvmPackages_16; - libnixf = callPackage ./default.nix { - inherit llvmPackages; - }; - regressionDeps = with pkgs; [ - clang-tools - nixpkgs-fmt - valgrind - ]; - shellOverride = old: { - nativeBuildInputs = old.nativeBuildInputs ++ regressionDeps; - shellHook = '' - export PATH="${pkgs.clang-tools}/bin:$PATH" - ''; - }; - in - { - packages.default = libnixf; - packages.libnixf = libnixf; - devShells.llvm = libnixf.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ llvmPackages.clang ]; - }); - devShells.default = libnixf.overrideAttrs shellOverride; - }; - systems = nixpkgs.lib.systems.flakeExposed; - }; -} diff --git a/libnixf/shell.nix b/libnixf/shell.nix deleted file mode 100644 index bf0337e60..000000000 --- a/libnixf/shell.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ pkgs ? import { } }: - -pkgs.callPackage ./default.nix { }