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

Ready for scrutiny #18

Merged
merged 38 commits into from
May 24, 2022
Merged

Ready for scrutiny #18

merged 38 commits into from
May 24, 2022

Conversation

mlitchard
Copy link
Contributor

No description provided.

rustbits/src/lib.rs Outdated Show resolved Hide resolved
@MatthewCroughan
Copy link
Contributor

In order to fix the lockfile simply rebase on master, git restore flake.lock and then run nix flake show or any other nix flake command which will regenerate the lockfile. That will then resolve the conflict.

mlitchard and others added 6 commits May 17, 2022 16:29
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bc41b01dd7a9fdffd32d9b03806798797532a5fe' (2022-04-23)
  → 'github:nixos/nixpkgs/48037fd90426e44e4bf03e6479e88a11453b9b66' (2022-05-18)
Co-authored-by: Avi <99489489+moreSocratic@users.noreply.github.com>
@mlitchard mlitchard merged commit dc66ef1 into main May 24, 2022
@mlitchard mlitchard deleted the off-nixify-dev-ml branch May 24, 2022 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants