Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

programming/rust: replace fenix with rust-overlay

Browse source
This commit is contained in:
Infinidoge 2023-08-16 00:26:45 -04:00
parent e6e9ce112d
commit 7acb83e5e4
3 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -48,12 +48,12 @@
"crane": { "crane": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"universe-cli", "universe-cli",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1685896619, "lastModified": 1685896619,
@ -116,7 +116,7 @@
"universe-cli", "universe-cli",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1688380630, "lastModified": 1688380630,
@ -151,27 +151,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1690957271,
"narHash": "sha256-//ItnqqVI6M5nrnQbpZ/a93S65YosvSSn8ozqEQOgQo=",
"owner": "nix-community",
"repo": "fenix",
"rev": "90aba0cc6f4c30a8f4111a0c4baf548bae5d9510",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -316,6 +295,24 @@
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@ -330,9 +327,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -683,7 +680,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"devshell": "devshell", "devshell": "devshell",
"fenix": "fenix",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"fork": "fork", "fork": "fork",
"haumea": "haumea", "haumea": "haumea",
@ -697,27 +693,32 @@
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"private": "private", "private": "private",
"quick-nix-registry": "quick-nix-registry", "quick-nix-registry": "quick-nix-registry",
"rust-overlay": "rust-overlay",
"universe-cli": "universe-cli" "universe-cli": "universe-cli"
} }
}, },
"rust-analyzer-src": { "rust-overlay": {
"flake": false, "inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1690888982, "lastModified": 1692151776,
"narHash": "sha256-MQniEaKbxsewuXGo+DaFE1IODeodExYHolPhUTrMoLc=", "narHash": "sha256-nE3Z0bRcABHQq2RFC1RsUVnGCJS0Y5xhYUBY9amxgJA=",
"owner": "rust-lang", "owner": "oxalica",
"repo": "rust-analyzer", "repo": "rust-overlay",
"rev": "151c750dac8d2a03a4a1f9c20d2fc29ad2042f02", "rev": "dea24da3d3be23ab53ee80314474afd5fcb03c1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rust-lang", "owner": "oxalica",
"ref": "nightly", "repo": "rust-overlay",
"repo": "rust-analyzer",
"type": "github" "type": "github"
} }
}, },
"rust-overlay": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"universe-cli", "universe-cli",
@ -744,9 +745,9 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"universe-cli", "universe-cli",
"nixpkgs" "nixpkgs"
@ -856,6 +857,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"universe-cli": { "universe-cli": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
@ -864,7 +880,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1690510733, "lastModified": 1690510733,

6
flake.nix
View file

@ -46,8 +46,8 @@
nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
# # --- Rust # # --- Rust
fenix.url = "github:nix-community/fenix"; rust-overlay.url = "github:oxalica/rust-overlay";
fenix.inputs.nixpkgs.follows = "nixpkgs"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ flake-parts, nixpkgs, private, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ self, lib, ... }: { outputs = inputs@{ flake-parts, nixpkgs, private, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ self, lib, ... }: {
@ -107,7 +107,7 @@
# --- Domain-Specific Overlays # --- Domain-Specific Overlays
inputs.agenix.overlays.default inputs.agenix.overlays.default
inputs.nix-minecraft.overlay inputs.nix-minecraft.overlay
inputs.fenix.overlays.default inputs.rust-overlay.overlays.default
inputs.universe-cli.overlays.default inputs.universe-cli.overlays.default
]; ];
home-manager = home-manager =

14
modules/global/programming/rust.nix
View file

@ -1,13 +1,11 @@
{ pkgs, ... }: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(fenix.complete.withComponents [ (rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
"cargo" extensions = [
"clippy" "rust-src"
"rust-src" "rust-analyzer"
"rustc" ];
"rustfmt" }))
])
rust-analyzer-nightly
gcc gcc
]; ];
} }