aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Building?

Browse source
This commit is contained in:
Andrea Ciceri 2021-10-14 10:35:16 +02:00
parent 9237779561
commit 741d9b5b6a
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
6 changed files with 36 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
.github/workflows/check.yml vendored
View file

@ -1,4 +1,3 @@
name: "Check & Build (with Cachix)" name: "Check & Build (with Cachix)"
on: on:
push: push:
@ -8,33 +7,33 @@ jobs:
check: check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2.3.4 - uses: actions/checkout@v2.3.4
- uses: cachix/install-nix-action@v13 - uses: cachix/install-nix-action@v13
with: with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve' install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
extra_nix_config: > extra_nix_config: >
experimental-features = nix-command flakes experimental-features = nix-command flakes
system-features = nixos-test benchmark big-parallel kvm recursive-nix system-features = nixos-test benchmark big-parallel kvm recursive-nix
extra-platforms = aarch64-linux extra-platforms = aarch64-linux
keep-going = true keep-going = true
substituters = substituters =
https://aciceri-fleet.cachix.org https://aciceri-fleet.cachix.org
https://nrdxp.cachix.org https://nrdxp.cachix.org
https://nix-community.cachix.org https://nix-community.cachix.org
arm.cachix.org arm.cachix.org
https://cache.nixos.org https://cache.nixos.org
trusted-public-keys = > trusted-public-keys = >
aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI= aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI=
nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=
nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8= arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8=
cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
- uses: cachix/cachix-action@v10 - uses: cachix/cachix-action@v10
with: with:
name: aciceri-fleet name: aciceri-fleet
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: sed -i 's/#\(.*checks.aarch64.*\)/\1/g' flake.nix # disabling aarch64 outputs - run: sed 's/#\(.*\)/\1/g' flake.nix # disabling outputs unsupported inside the GitHub action
- run: nix -Lv flake check - run: nix -Lv flake check
- run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel" - run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel"
- run: nix -Lv develop -c echo OK - run: nix -Lv develop -c echo OK

8
flake.nix
View file

@ -182,9 +182,11 @@
} }
// { // {
budModules = { devos = import ./bud; }; budModules = { devos = import ./bud; };
# checks.aarch64-linux = { }; # this line will be uncommented by Github Action in order since it can't build aarch64 derivations
} # checks.aarch64-linux = { }; # ga-uncomment
// { # checks.x86_64-darwin = { }; # ga-uncomment
# packages.x86_64-darwin = { }; # ga-uncomment
darwinConfigurations."mbp" = darwin.lib.darwinSystem { darwinConfigurations."mbp" = darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
modules = [ home.darwinModules.home-manager ./hosts/mbp ]; modules = [ home.darwinModules.home-manager ./hosts/mbp ];

2
pkgs/default.nix
View file

@ -2,7 +2,5 @@ final: prev: {
# keep sources this first # keep sources this first
sources = prev.callPackage (import ./_sources/generated.nix) { }; sources = prev.callPackage (import ./_sources/generated.nix) { };
customEmacs = prev.callPackage (import ./emacs) { }; customEmacs = prev.callPackage (import ./emacs) { };
ungoogled-chromium = import ./ungoogled-chromium { inherit prev; };
vscodium = import ./vscodium { inherit prev; };
# then, call packages with `final.callPackage` # then, call packages with `final.callPackage`
} }

10
pkgs/ungoogled-chromium/default.nix
View file

@ -1,10 +0,0 @@
{ prev, ... }:
prev.runCommandNoCC "wrap-chromium"
{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
''
makeWrapper ${prev.pkgs.chromium}/bin/chromium $out/bin/chromium \
--add-flags "--enable-features=UseOzonePlatform" \
--add-flags "--ozone-platform=wayland"
ln -sf ${prev.pkgs.chromium}/share $out/share
''

10
pkgs/vscodium/default.nix
View file

@ -1,10 +0,0 @@
{ prev, ... }:
prev.runCommandNoCC "codium"
{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
''
makeWrapper ${prev.pkgs.vscodium}/bin/codium $out/bin/codium \
--add-flags "--enable-features=UseOzonePlatform" \
--add-flags "--ozone-platform=wayland"
ln -sf ${prev.pkgs.vscodium}/share $out/share
''

3
users/profiles/emacs/default.nix
View file

@ -12,7 +12,6 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
python-language-server
python python
fd fd
ag ag
@ -29,5 +28,5 @@
mimeType = "x-scheme-handler/org-protocol"; mimeType = "x-scheme-handler/org-protocol";
} }
) )
]; ] ++ (if pkgs.system == "x86_64-linux" then [ python-language-server ] else [ ]);
} }