From 66fe7c870eb8a6edc570f39e1dc527b03c028e0f Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Mon, 1 Jan 2024 11:07:10 -0800 Subject: [PATCH] Update to 23.11 --- .github/workflows/check-targets.yml | 82 +++++++++++++++++++++++++ flake.lock | 27 ++------ nix/home-manager/astral/cli/default.nix | 2 +- nix/lib/github-actions.nix | 1 + nix/nixos-modules/astral/nix-utils.nix | 5 +- nix/outputs.nix | 41 ++++++++++--- 6 files changed, 126 insertions(+), 32 deletions(-) diff --git a/.github/workflows/check-targets.yml b/.github/workflows/check-targets.yml index db897783..8c99cec5 100644 --- a/.github/workflows/check-targets.yml +++ b/.github/workflows/check-targets.yml @@ -60,6 +60,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -101,6 +103,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -142,6 +146,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -183,6 +189,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -229,6 +237,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -270,6 +280,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -331,6 +343,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -373,6 +387,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -416,6 +432,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -477,6 +495,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -519,6 +539,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -580,6 +602,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -628,6 +652,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -676,6 +702,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -718,6 +746,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -762,6 +792,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -824,6 +856,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -862,6 +896,50 @@ jobs: ' strategy: fail-fast: false + nixos-system-xn--vp9h: + name: NixOS sys. xn--vp9h + needs: + - nixos-system-__baseServer + runs-on: ubuntu-latest + steps: + - uses: webfactory/ssh-agent@v0.8.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + - env: + KNOWN_HOSTS: ${{ env.KNOWN_HOSTS }} + name: Append to known_hosts + run: 'echo ''\n'' >> ~/.ssh/known_hosts + + echo "$KNOWN_HOSTS" >> ~/.ssh/known_hosts + + ' + - uses: cachix/install-nix-action@v22 + with: + extra_nix_config: 'experimental-features = nix-command flakes + + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + + allowUnfree = true + + ' + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v12 + with: + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + name: astralbijection + - env: + TARGET_FLAKE: ${{ env.TARGET_FLAKE }} + name: Build targets + run: GC_DONT_GC=1 nix build --show-trace --log-lines 10000 --fallback "$TARGET_FLAKE#"'nixosConfigurations.xn--vp9h.config.system.build.toplevel' + - if: ${{ always() }} + name: Log remaining space + run: 'echo "=== Space left after build ===" + + df -h + + ' + strategy: + fail-fast: false nixos-system-yato: name: NixOS sys. yato needs: @@ -885,6 +963,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 @@ -932,6 +1012,8 @@ jobs: access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + allowUnfree = true + ' nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v12 diff --git a/flake.lock b/flake.lock index c0cec905..93183b08 100644 --- a/flake.lock +++ b/flake.lock @@ -286,21 +286,19 @@ "inputs": { "nixpkgs": [ "nixpkgs-unstable" - ], - "utils": "utils_2" + ] }, "locked": { - "lastModified": 1671323335, - "narHash": "sha256-LRrLk7HJna1DIsTSz4+b/7t8Xw3NP+xkiBZ5z44mmzo=", + "lastModified": 1701153607, + "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=", "owner": "Mic92", "repo": "nix-ld", - "rev": "a6fd41e3934eb35f04f88826ee0118e391b4e31f", + "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7", "type": "github" }, "original": { "owner": "Mic92", "repo": "nix-ld", - "rev": "a6fd41e3934eb35f04f88826ee0118e391b4e31f", "type": "github" } }, @@ -681,21 +679,6 @@ } }, "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { "inputs": { "systems": "systems_2" }, @@ -719,7 +702,7 @@ "flake-utils": "flake-utils_5", "nix": "nix", "nixpkgs": "nixpkgs_5", - "utils": "utils_3" + "utils": "utils_2" }, "locked": { "lastModified": 1699433213, diff --git a/nix/home-manager/astral/cli/default.nix b/nix/home-manager/astral/cli/default.nix index 9da1bbd8..429fca11 100644 --- a/nix/home-manager/astral/cli/default.nix +++ b/nix/home-manager/astral/cli/default.nix @@ -85,7 +85,7 @@ in with lib; { enable = true; initExtra = commonProfile; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; autocd = true; defaultKeymap = "emacs"; diff --git a/nix/lib/github-actions.nix b/nix/lib/github-actions.nix index ffdbe145..33dfef5d 100644 --- a/nix/lib/github-actions.nix +++ b/nix/lib/github-actions.nix @@ -133,6 +133,7 @@ with lib; rec { extra_nix_config = '' experimental-features = nix-command flakes access-tokens = github.com=${ghexpr "secrets.GITHUB_TOKEN"} + allowUnfree = true ''; }; } diff --git a/nix/nixos-modules/astral/nix-utils.nix b/nix/nixos-modules/astral/nix-utils.nix index 83bbf5ba..6be2cc7e 100644 --- a/nix/nixos-modules/astral/nix-utils.nix +++ b/nix/nixos-modules/astral/nix-utils.nix @@ -15,6 +15,9 @@ }; package = pkgs.nixUnstable; - extraOptions = "experimental-features = nix-command flakes"; + extraOptions = '' + experimental-features = nix-command flakes + allowUnfree = true + ''; }; } diff --git a/nix/outputs.nix b/nix/outputs.nix index f15ec47a..426e38d7 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -47,37 +47,61 @@ in { homeConfigurations = { default = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-cli ]; }; m1 = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.aarch64-darwin; + pkgs = import nixpkgs.legacyPackages { + system = "aarch64-darwin"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-cli-full ]; }; "astrid@aliaconda" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-scientific vscode-server-home ]; }; "astrid@banana" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-gui ]; }; "astrid@chungus" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-gui ]; }; "astrid@Discovery" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-gui vscode-server-home ]; }; "astrid@shai-hulud" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-linux"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-gui-tablet ]; }; "astrid@soulcaster" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-darwin; + pkgs = import nixpkgs.legacyPackages { + system = "x86_64-darwin"; + config.allowUnfree = true; + }; modules = [ self.homeModules.astral-macos ]; }; }; @@ -98,6 +122,7 @@ in { pkgs = import nixpkgs { inherit system; overlays = [ self.overlays.default ]; + config.allowUnfree = true; }; in rec { gh-ci-matrix = pkgs.callPackage ./pkgs/gh-ci-matrix { inherit self; };