Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake.lock: Update #176

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions effects/flake-update/test-module-eval.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ rec {
assert basicUpdateHerculesCI.onSchedule.flake-update.when ==
{ dayOfMonth = null; dayOfWeek = null; hour = [ 23 ]; minute = 59; };

assert contains "cd 'subflake'" subflakeUpdateConfig.git.update.script;
assert contains "cd subflake" subflakeUpdateConfig.git.update.script;
# The default (flake at root) is overridden by the user definition. Potentially not future proof because it could match some other './.' substring.
assert ! contains "cd '.'" subflakeUpdateConfig.git.update.script;
assert contains "cd '.'" basicUpdateConfig.git.update.script;
assert ! contains "cd ." subflakeUpdateConfig.git.update.script;
assert contains "cd ." basicUpdateConfig.git.update.script;

assert contains "--update-input nixpkgs" subflakeUpdateConfig.git.update.script;

Expand Down
2 changes: 1 addition & 1 deletion effects/nixops2/test/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ let
ps.nixops-hercules-ci
ps.nixops-aws
]);
nix = pkgs.nixUnstable;
nix = pkgs.nix;

# Override dynamic options for CI
prebuildOnlyNetworkFiles = [
Expand Down
30 changes: 15 additions & 15 deletions effects/nixops2/test/flake.lock

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

2 changes: 1 addition & 1 deletion flake-dev.nix
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ top@{ withSystem, lib, inputs, config, self, ... }: {
in {
flake-update = hci-effects.callPackage ./effects/flake-update/test.nix { };
# TODO after https://github.com/NixOS/nix/issues/7730, use nix master
flake-update-nix-unstable = hci-effects.callPackage ./effects/flake-update/test.nix { nix = pkgs.nixVersions.unstable; };
flake-update-nix-git = hci-effects.callPackage ./effects/flake-update/test.nix { nix = pkgs.nixVersions.git; };
git-update = hci-effects.callPackage ./effects/modules/git-update/test.nix { };
write-branch = hci-effects.callPackage ./effects/write-branch/test.nix { };
# Nix is broken: https://github.com/NixOS/nix/issues/9146
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.