Skip to content

Commit

Permalink
Update flake and make it compatible with master changes
Browse files Browse the repository at this point in the history
  • Loading branch information
oxalica committed May 1, 2024
1 parent b686925 commit aa24d32
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions flake.lock

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

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rec {
date = "${substring 0 4 mtime}-${substring 4 2 mtime}-${substring 6 2 mtime}";
rev = self.rev or (lib.warn "Git changes are not committed" (self.dirtyRev or "dirty"));

mkNil = { rustPlatform, nixUnstable, ... }:
mkNil = { rustPlatform, nixVersions, ... }:
rustPlatform.buildRustPackage {
pname = "nil";
version = "unstable-${date}";
Expand All @@ -29,7 +29,7 @@ rec {
allowBuiltinFetchGit = false;
};

nativeBuildInputs = [ nixUnstable.out ];
nativeBuildInputs = [ (nixVersions.latest or nixVersions.unstable) ];

CFG_RELEASE = "git-${rev}";

Expand Down Expand Up @@ -148,7 +148,7 @@ rec {
# See comments above.
devShells.full = devShells.default.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.nixUnstable.out
(pkgs.nixVersions.latest or pkgs.nixVersions.unstable).out
];
});

Expand Down

0 comments on commit aa24d32

Please sign in to comment.