oxalica/nil
1
1
Fork 0
mirror of https://github.com/oxalica/nil.git synced 2024-09-11 18:47:13 +03:00
Code Issues Projects Releases Wiki Activity

Update flake and make it compatible with master changes

Browse Source 
Ref: https://github.com/NixOS/nixpkgs/pull/305951
This commit is contained in:
oxalica 2024-05-01 09:45:04 -04:00
parent b6869253ef
commit aa24d32f04
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704161960, "lastModified": 1714314149,
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63143ac2c9186be6d9da6035fa22620018c85932", "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -51,11 +51,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704593904, "lastModified": 1714529851,
"narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=", "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c36fd70a99decfa6e110c86f296a97613034a680", "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -18,7 +18,7 @@ rec {
date = "${substring 0 4 mtime}-${substring 4 2 mtime}-${substring 6 2 mtime}"; 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")); rev = self.rev or (lib.warn "Git changes are not committed" (self.dirtyRev or "dirty"));
mkNil = { rustPlatform, nixUnstable, ... }: mkNil = { rustPlatform, nixVersions, ... }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "nil"; pname = "nil";
version = "unstable-${date}"; version = "unstable-${date}";
@ -29,7 +29,7 @@ rec {
allowBuiltinFetchGit = false; allowBuiltinFetchGit = false;
}; };
nativeBuildInputs = [ nixUnstable.out ]; nativeBuildInputs = [ (nixVersions.latest or nixVersions.unstable) ];
CFG_RELEASE = "git-${rev}"; CFG_RELEASE = "git-${rev}";
@ -148,7 +148,7 @@ rec {
# See comments above. # See comments above.
devShells.full = devShells.default.overrideAttrs (old: { devShells.full = devShells.default.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.nixUnstable.out (pkgs.nixVersions.latest or pkgs.nixVersions.unstable).out
]; ];
}); });