andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

nix: remove rust-overlay input

Browse Source
This commit is contained in:
HigherOrderLogic
2026-06-17 17:30:48 +10:00
committed by Ivan Molodetskikh
parent fdb6d85fc7
commit 165a6d1ee8
2 changed files with 12 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+1 -22
View File
@@ -18,28 +18,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1757989933,
"narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
} }
} }
}, },
flake.nix
+11 -34
View File
@@ -2,22 +2,12 @@
{ {
description = "Niri: A scrollable-tiling Wayland compositor."; description = "Niri: A scrollable-tiling Wayland compositor.";
inputs = { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# NOTE: This is not necessary for end users
# You can omit it with `inputs.rust-overlay.follows = ""`
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = outputs =
{ {
self, self,
nixpkgs, nixpkgs,
rust-overlay,
}: }:
let let
revision = self.shortRev or self.dirtyShortRev or "unknown"; revision = self.shortRev or self.dirtyShortRev or "unknown";
@@ -182,33 +172,20 @@
system: system:
let let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
rust-bin = rust-overlay.lib.mkRustBin { } pkgs; rustfmt' = pkgs.rustfmt.override { asNightly = true; };
inherit (self.packages.${system}) niri; inherit (self.packages.${system}) niri;
in in
{ {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = [ packages = builtins.attrValues {
# We don't use the toolchain from nixpkgs inherit (pkgs)
# because we prefer a nightly toolchain rustc
# and we *require* a nightly rustfmt cargo
(rust-bin.selectLatestNightlyWith ( clippy
toolchain: cargo-insta
toolchain.default.override { ;
extensions = [ inherit rustfmt';
# includes already: };
# rustc
# cargo
# rust-std
# rust-docs
# rustfmt-preview
# clippy-preview
"rust-analyzer"
"rust-src"
];
}
))
pkgs.cargo-insta
];
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.rustPlatform.bindgenHook pkgs.rustPlatform.bindgenHook