progress
This commit is contained in:
parent
f4eceb8971
commit
39f0a59f77
3 changed files with 28 additions and 41 deletions
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
|
@ -34,9 +34,9 @@ jobs:
|
||||||
name: Generate Nix Matrix
|
name: Generate Nix Matrix
|
||||||
run: |
|
run: |
|
||||||
set -Eeu
|
set -Eeu
|
||||||
#echo "matrix=$(nix eval --json '.#githubActions.matrix')" >> "$GITHUB_OUTPUT"
|
echo "matrix=$(nix eval --json '.#githubActions.matrix')" >> "$GITHUB_OUTPUT"
|
||||||
#echo 'matrix={"include":[{"attr":"githubActions.checks.x86_64-linux.hello","os":["ubuntu-22.04"]},{"attr":"githubActions.checks.x86_64-linux.lxc","os":["ubuntu-22.04"]}]}' >> "$GITHUB_OUTPUT"
|
#echo 'matrix={"include":[{"attr":"githubActions.checks.x86_64-linux.hello","os":["ubuntu-22.04"]},{"attr":"githubActions.checks.x86_64-linux.lxc","os":["ubuntu-22.04"]}]}' >> "$GITHUB_OUTPUT"
|
||||||
echo 'matrix={"include":[{"attr":"githubActions.checks.x86_64-linux.lxc","os":["ubuntu-22.04"]}]}' >> "$GITHUB_OUTPUT"
|
#echo 'matrix={"include":[{"attr":"githubActions.checks.x86_64-linux.lxc","os":["ubuntu-22.04"]}]}' >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
nix-build:
|
nix-build:
|
||||||
needs: nix-matrix
|
needs: nix-matrix
|
||||||
|
@ -51,6 +51,4 @@ jobs:
|
||||||
nix_path: nixpkgs=channel:nixos-unstable
|
nix_path: nixpkgs=channel:nixos-unstable
|
||||||
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
|
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
|
||||||
github_access_token: ${{ secrets.GITHUB_TOKEN }}
|
github_access_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Print nixpkgs version
|
|
||||||
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
|
|
||||||
- run: nix build -L ".#${{ matrix.attr }}"
|
- run: nix build -L ".#${{ matrix.attr }}"
|
||||||
|
|
35
flake.nix
35
flake.nix
|
@ -25,7 +25,8 @@
|
||||||
then ""
|
then ""
|
||||||
else "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}";
|
else "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}";
|
||||||
|
|
||||||
supportedSystems = [ "i386-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
#supportedSystems = [ "i386-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" "x86_64-windows" ];
|
||||||
|
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ];
|
||||||
|
|
||||||
# Generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
|
# Generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
|
||||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||||
|
@ -43,8 +44,12 @@
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
overlays = [
|
overlays = [
|
||||||
|
zicross.overlays.zig
|
||||||
|
zicross.overlays.debian
|
||||||
|
zicross.overlays.windows
|
||||||
|
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
hello = with final; stdenv.mkDerivation rec {
|
hello = with final; (if lib.strings.hasSuffix "windows" system then zigStdenv else stdenv).mkDerivation rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
inherit system;
|
inherit system;
|
||||||
pname = "hello";
|
pname = "hello";
|
||||||
|
@ -83,32 +88,22 @@
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
packages = {
|
packages = {
|
||||||
|
inherit (pkgs) hello;
|
||||||
|
|
||||||
# This changes things in "packages" below of the form: "packages.x86_64-linux" into
|
# This changes things in "packages" below of the form: "packages.x86_64-linux" into
|
||||||
# "githubActions.checks.x86_64-linux.hello" so that the GHA matrix can iterate over them.
|
# "githubActions.targets.x86_64-linux.hello" so that the GHA matrix can iterate over them.
|
||||||
githubActions = nix-github-actions.lib.mkGithubMatrix {
|
githubActions = nix-github-actions.lib.mkGithubMatrix {
|
||||||
#checks = nixpkgs.lib.getAttrs [ "x86_64-linux" "x86_64-darwin" ] self.packages;
|
|
||||||
checks = nixpkgs.lib.getAttrs supportedSystems self.packages;
|
checks = nixpkgs.lib.getAttrs supportedSystems self.packages;
|
||||||
};
|
};
|
||||||
hello = nixpkgs.legacyPackages.${system}.hello;
|
|
||||||
lxc = pkgs.callPackage ./nix/lxc.nix { package = packages.default; };
|
|
||||||
};
|
};
|
||||||
packages.default = self.packages.${system}.hello;
|
packages.default = self.packages.${system}.hello;
|
||||||
|
|
||||||
#packages.win64zip = pkgs.callPackage ./nix/pkg-win64zip.nix { package = packages.default; };
|
packages.lxc = pkgs.callPackage ./nix/lxc.nix { package = packages.default; };
|
||||||
#packages.win64zip = pkgs.callPackage ./nix/pkg-win64-wix.nix { package = packages.default; };
|
packages.x86_64-windows = pkgs.callPackage ./nix/pkg-win64zip.nix { package = packages.default; };
|
||||||
packages.win64zip = pkgs.packageForWindows packages.default {
|
#packages.x86_64-wix = pkgs.callPackage ./nix/pkg-win64-wix.nix { inherit pkgs packages; };
|
||||||
targetSystem = "x86_64-windows";
|
|
||||||
appendExe = [ "hello" ];
|
|
||||||
deps = {
|
|
||||||
libcpp = {
|
|
||||||
tail = "libc++-14.0.3-1-any.pkg.tar.zst";
|
|
||||||
sha256 = "1r73zs9naislzzjn7mr3m8s6pikgg3y4mv550hg09gcsjc719kzz";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
apps.hello = flake-utils.lib.mkApp { drv = packages.default; };
|
#apps.hello = flake-utils.lib.mkApp { drv = packages.default; };
|
||||||
apps.${system}.default = apps.hello;
|
#apps.${system}.default = apps.hello;
|
||||||
|
|
||||||
devShells.default = import ./shell.nix { inherit pkgs; };
|
devShells.default = import ./shell.nix { inherit pkgs; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
overlays = [
|
{ pkgs, package }:
|
||||||
zicross.overlays.zig
|
|
||||||
zicross.overlays.debian
|
|
||||||
zicross.overlays.windows
|
|
||||||
|
|
||||||
(final: prev: {
|
pkgs.packageForWindows package {
|
||||||
hello = with final; zigStdenv.mkDerivation rec {
|
|
||||||
|
|
||||||
pkgs.packageForWindows packages.default {
|
|
||||||
targetSystem = "x86_64-windows";
|
targetSystem = "x86_64-windows";
|
||||||
appendExe = [ "hello" ];
|
appendExe = [ "hello" ];
|
||||||
deps = {
|
deps = {
|
||||||
|
@ -15,4 +9,4 @@ pkgs.packageForWindows packages.default {
|
||||||
sha256 = "1r73zs9naislzzjn7mr3m8s6pikgg3y4mv550hg09gcsjc719kzz";
|
sha256 = "1r73zs9naislzzjn7mr3m8s6pikgg3y4mv550hg09gcsjc719kzz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
}
|
Loading…
Reference in a new issue