mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

examples: change default architecture to aarch64-darwin

Browse source
This commit is contained in:
Michael Hoang 2024-11-17 13:11:30 +11:00
parent 3c27b08740
commit a4d4d12e38
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/test.yml vendored
View file

@ -149,6 +149,9 @@ jobs:
/usr/bin/sed -i.bak \ /usr/bin/sed -i.bak \
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \ "s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
flake.nix flake.nix
/usr/bin/sed -i.bak \
's/nixpkgs.hostPlatform = "aarch64-darwin";/nixpkgs.hostPlatform = "'$(nix eval --expr builtins.currentSystem --impure --raw)'";/' \
flake.nix
popd popd
nix run .#darwin-rebuild -- \ nix run .#darwin-rebuild -- \
switch --flake ~/.config/nix-darwin#simple \ switch --flake ~/.config/nix-darwin#simple \
@ -157,7 +160,9 @@ jobs:
- name: Rebuild and activate simple flake, but this time using nix-darwin's flake interface - name: Rebuild and activate simple flake, but this time using nix-darwin's flake interface
run: | run: |
. /etc/static/bashrc . /etc/static/bashrc
darwin-rebuild build --flake ./modules/examples/flake#simple --override-input nix-darwin . --override-input nixpkgs nixpkgs/${{ env.CURRENT_STABLE_CHANNEL }} darwin-rebuild switch --flake ~/.config/nix-darwin#simple \
--override-input nix-darwin . \
--override-input nixpkgs nixpkgs/${{ env.CURRENT_STABLE_CHANNEL }}
- name: Test uninstallation of nix-darwin - name: Test uninstallation of nix-darwin
run: | run: |
nix run .#darwin-uninstaller --override-input nixpkgs nixpkgs/${{ env.CURRENT_STABLE_CHANNEL }} nix run .#darwin-uninstaller --override-input nixpkgs nixpkgs/${{ env.CURRENT_STABLE_CHANNEL }}
@ -182,6 +187,9 @@ jobs:
/usr/bin/sed -i.bak \ /usr/bin/sed -i.bak \
"s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \ "s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \
flake.nix flake.nix
/usr/bin/sed -i.bak \
's/nixpkgs.hostPlatform = "aarch64-darwin";/nixpkgs.hostPlatform = "'$(nix eval --expr builtins.currentSystem --impure --raw)'";/' \
flake.nix
popd popd
nix run .#darwin-rebuild -- \ nix run .#darwin-rebuild -- \
switch --flake ~/.config/nix-darwin#simple \ switch --flake ~/.config/nix-darwin#simple \
@ -190,7 +198,9 @@ jobs:
- name: Rebuild and activate simple flake, but this time using nix-darwin's flake interface - name: Rebuild and activate simple flake, but this time using nix-darwin's flake interface
run: | run: |
. /etc/static/bashrc . /etc/static/bashrc
darwin-rebuild build --flake ./modules/examples/flake#simple --override-input nix-darwin . --override-input nixpkgs nixpkgs/nixpkgs-unstable darwin-rebuild switch --flake ~/.config/nix-darwin#simple \
--override-input nix-darwin . \
--override-input nixpkgs nixpkgs/nixpkgs-unstable
- name: Test uninstallation of nix-darwin - name: Test uninstallation of nix-darwin
run: | run: |
nix run .#darwin-uninstaller --override-input nixpkgs nixpkgs/nixpkgs-unstable nix run .#darwin-uninstaller --override-input nixpkgs nixpkgs/nixpkgs-unstable

5
modules/examples/flake/flake.nix
View file

@ -30,7 +30,7 @@
system.stateVersion = 5; system.stateVersion = 5;
# The platform the configuration will be used on. # The platform the configuration will be used on.
nixpkgs.hostPlatform = "x86_64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
}; };
in in
{ {
@ -39,8 +39,5 @@
darwinConfigurations."simple" = nix-darwin.lib.darwinSystem { darwinConfigurations."simple" = nix-darwin.lib.darwinSystem {
modules = [ configuration ]; modules = [ configuration ];
}; };
# Expose the package set, including overlays, for convenience.
darwinPackages = self.darwinConfigurations."simple".pkgs;
}; };
} }