fix build with rust-overlay

This commit is contained in:
Noah Masur
2025-11-02 17:01:34 -05:00
parent d79c1ba7df
commit aea3e95ef5
3 changed files with 21 additions and 31 deletions

42
flake.lock generated
View File

@@ -153,7 +153,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": [
"rust-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1761920229, "lastModified": 1761920229,
@@ -322,11 +324,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1728538411, "lastModified": 1744536153,
"narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -369,42 +371,22 @@
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nur": "nur", "nur": "nur",
"rust-overlay": "rust-overlay",
"wsl": "wsl", "wsl": "wsl",
"zellij-switch": "zellij-switch", "zellij-switch": "zellij-switch",
"zenyd-mpv-scripts": "zenyd-mpv-scripts" "zenyd-mpv-scripts": "zenyd-mpv-scripts"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1759631821,
"narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1736476219, "lastModified": 1762051177,
"narHash": "sha256-+qyv3QqdZCdZ3cSO/cbpEY6tntyYjfe1bB12mdpNFaY=", "narHash": "sha256-pESNTx/m3WnrYx+OujBtDP5Bj0/mAyHa4MgEwzkgkLE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "de30cc5963da22e9742bbbbb9a3344570ed237b9", "rev": "08c33e87c4829bbdd42b5af247cf7a19e126369f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -502,7 +484,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2", "rust-overlay": [
"rust-overlay"
],
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {

View File

@@ -64,16 +64,22 @@
flake = false; flake = false;
}; };
rust-overlay = {
url = "github:oxalica/rust-overlay";
};
# Zellij Switcher # Zellij Switcher
zellij-switch = { zellij-switch = {
url = "github:mostafaqanbaryan/zellij-switch"; url = "github:mostafaqanbaryan/zellij-switch";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
}; };
# Text editor # Text editor
helix = { helix = {
url = "github:helix-editor/helix"; url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.rust-overlay.follows = "rust-overlay";
}; };
# # Nextcloud Apps # # Nextcloud Apps

View File

@@ -19,7 +19,7 @@ in
pkgs.delta # Fancy diffs pkgs.delta # Fancy diffs
pkgs.difftastic # Other fancy diffs pkgs.difftastic # Other fancy diffs
pkgs.doggo # DNS client (dig) pkgs.doggo # DNS client (dig)
pkgs.du-dust # Disk usage tree (ncdu) pkgs.dust # Disk usage tree (ncdu)
pkgs.dua # File sizes (du) pkgs.dua # File sizes (du)
pkgs.duf # Basic disk information (df) pkgs.duf # Basic disk information (df)
pkgs.jless # JSON viewer pkgs.jless # JSON viewer
@@ -42,7 +42,7 @@ in
programs.fish.shellAliases = { programs.fish.shellAliases = {
"du" = lib.mkDefault (lib.getExe pkgs.dua); "du" = lib.mkDefault (lib.getExe pkgs.dua);
"ncdu" = lib.mkDefault (lib.getExe pkgs.du-dust); "ncdu" = lib.mkDefault (lib.getExe pkgs.dust);
"df" = lib.mkDefault (lib.getExe pkgs.duf); "df" = lib.mkDefault (lib.getExe pkgs.duf);
# Use eza (exa) instead of ls for fancier output # Use eza (exa) instead of ls for fancier output