Merge pull request #141 from gytis-ivaskevicius/dependabot/github_actions/nixbuild/nix-quick-install-action-26

Bump nixbuild/nix-quick-install-action from 25 to 26
Merge pull request #144 from lordkekz/override-nixpkgs-config
2024-07-14 19:20:29 +03:00 · 2024-05-12 20:06:16 +03:00 · 2024-05-12 20:05:46 +03:00 · 2024-05-12 20:04:29 +03:00 · 2024-05-03 23:32:55 +03:00 · 2024-04-08 15:38:34 +02:00
2 changed files with 6 additions and 5 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: nixbuild/nix-quick-install-action@v26
      - uses: DeterminateSystems/magic-nix-cache-action@main

      # Quick eval
@ -23,7 +23,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: nixbuild/nix-quick-install-action@v26
      - uses: DeterminateSystems/magic-nix-cache-action@main

      # Execute /tests/*
@ -36,7 +36,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: nixbuild/nix-quick-install-action@v25
+      - uses: nixbuild/nix-quick-install-action@v26
      - uses: DeterminateSystems/magic-nix-cache-action@main

      # Build /examples/*
--- a/lib/mkFlake.nix
+++ b/lib/mkFlake.nix
@ -157,8 +157,9 @@ let
                        {
                          inherit (host) system;
                          overlays = selectedNixpkgs.overlays;
-                          config = selectedNixpkgs.config // config.nixpkgs.config;
+                          config = selectedNixpkgs.config // hostConfig.nixpkgs.config;
                        } // { inherit (selectedNixpkgs) name input; };
+                  nixpkgs.config = lib.mkForce { };
                }
              else { })

@ -167,7 +168,7 @@ let
              })

              (optionalAttrs (options ? nix.package) {
-                nix.package = lib.mkDefault pkgs.nixUnstable;
+                nix.package = lib.mkDefault pkgs.nixVersions.latest;
              })

              (optionalAttrs (options ? nix.extraOptions) {
Author	SHA1	Message	Date
Gytis Ivaskevicius	3542fe9126	Merge pull request #141 from gytis-ivaskevicius/dependabot/github_actions/nixbuild/nix-quick-install-action-26 Bump nixbuild/nix-quick-install-action from 25 to 26	2024-05-12 20:06:16 +03:00
Gytis Ivaskevicius	fe008c55b2	Merge pull request #144 from lordkekz/override-nixpkgs-config fix: Override option nixpkgs.config to avoid failed assertion	2024-05-12 20:05:46 +03:00
Gytis Ivaskevicius	2a91382577	Merge pull request #146 from fl42v/master use latest nix instead of removed unstable	2024-05-12 20:04:29 +03:00
fl42v	f3d032cb18	use latest nix instead of removed unstable fix #145	2024-05-03 23:32:55 +03:00
lordkekz	b09bd64c0c	fix: Override option nixpkgs.config to avoid failed assertion	2024-04-08 15:38:34 +02:00
dependabot[bot]	6d2fbf3421	Bump nixbuild/nix-quick-install-action from 25 to 26 Bumps [nixbuild/nix-quick-install-action](https://github.com/nixbuild/nix-quick-install-action) from 25 to 26. - [Release notes](https://github.com/nixbuild/nix-quick-install-action/releases) - [Changelog](https://github.com/nixbuild/nix-quick-install-action/blob/master/RELEASE) - [Commits](https://github.com/nixbuild/nix-quick-install-action/compare/v25...v26) --- updated-dependencies: - dependency-name: nixbuild/nix-quick-install-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-24 21:57:16 +00:00