Skip to content

Commit

Permalink
Merge pull request #14 from nixbuild/nix-2_8_1
Browse files Browse the repository at this point in the history
Nix 2.8.0 -> 2.8.1
  • Loading branch information
rickynils authored May 31, 2022
2 parents ed98d0c + d0fc79b commit 6923bbc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-10.15]
nix_version:
- 2.8.0
- 2.8.1
- 2.7.0
- 2.6.1
- 2.6.0
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-10.15]
nix_version:
- 2.8.0
- 2.8.1
- 2.7.0
- 2.6.1
- 2.6.0
Expand All @@ -90,7 +90,7 @@ jobs:
- 2.3.7
- 2.2.2
include:
- nix_version: 2.8.0
- nix_version: 2.8.1
nix_conf: experimental-features = nix-command flakes
- nix_version: 2.7.0
nix_conf: experimental-features = nix-command flakes
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:

nix_version:
required: true
default: "2.8.0"
default: "2.8.1"
description: |
The version of Nix that should be installed
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs-nix-2_8_0.url = "nixpkgs/b57126a16e9a70fc763b517ad45bf5f16f9e4dab";
nixpkgs-nix-2_8_1.url = "nixpkgs/eb78d30bf48c1064299d96082054bae587582f2e";
nixpkgs-nix-2_7_0.url = "nixpkgs/e3a73aed432da016f57230ac977cf515525e6cc5";
nixpkgs-nix-2_6_1.url = "nixpkgs/a4a3ef1016e6dddda8ebd3bde232ba5102a406e7";
nixpkgs-nix-2_6_0.url = "nixpkgs/8ea208739449a10d5deee5cea0f229ac3a65cfb6";
Expand All @@ -25,7 +25,7 @@
outputs = {
self,
flake-utils,
nixpkgs-nix-2_8_0,
nixpkgs-nix-2_8_1,
nixpkgs-nix-2_7_0,
nixpkgs-nix-2_6_1,
nixpkgs-nix-2_6_0,
Expand All @@ -45,14 +45,14 @@

let

inherit (nixpkgs-nix-2_8_0) lib;
inherit (nixpkgs-nix-2_8_1) lib;

preferRemoteBuild = drv: drv.overrideAttrs (_: {
preferLocalBuild = false;
allowSubstitutes = true;
});

pkgs = import nixpkgs-nix-2_8_0 {
pkgs = import nixpkgs-nix-2_8_1 {
inherit system;
overlays = [
(self: super: super.prefer-remote-fetch self super)
Expand All @@ -76,7 +76,7 @@
nixVersions = system: lib.listToAttrs (map (nix: lib.nameValuePair
nix.version nix
) (
[ nixpkgs-nix-2_8_0.legacyPackages.${system}.nix
[ nixpkgs-nix-2_8_1.legacyPackages.${system}.nix
nixpkgs-nix-2_7_0.legacyPackages.${system}.nix
nixpkgs-nix-2_6_1.legacyPackages.${system}.nix
nixpkgs-nix-2_6_0.legacyPackages.${system}.nix
Expand Down

0 comments on commit 6923bbc

Please sign in to comment.