astro/deadnix
1
1
Fork 0
mirror of https://github.com/astro/deadnix.git synced 2024-09-11 10:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

flake.nix: switch from mozillapkgs to fenix

Browse Source
This commit is contained in:
Astro 2021-12-09 16:44:31 +01:00
parent 3bab18e097
commit dd04c4bf35
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
flake.lock
View File

@ -1,24 +1,31 @@
{
"nodes": {
"mozillapkgs": {
"flake": false,
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1637337116,
"narHash": "sha256-LKqAcdL+woWeYajs02bDQ7q8rsqgXuzhC354NoRaV80=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "cbc7435f5b0b3d17b16fb1d20cf7b616eec5e093",
"lastModified": 1639031104,
"narHash": "sha256-noY4xo0PdMz1Qj7GCQ7DlChEjBLxqiny0sUcEE7JK7w=",
"owner": "nix-community",
"repo": "fenix",
"rev": "034f3d60c19138b87e768bd85c2743262242cc94",
"type": "github"
},
"original": {
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1638203339,
@ -48,26 +55,29 @@
"type": "indirect"
}
},
"nixpkgs_2": {
"root": {
"inputs": {
"fenix": "fenix",
"naersk": "naersk",
"nixpkgs": "nixpkgs",
"utils": "utils"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1638722875,
"narHash": "sha256-B1BSlq6Mg4WLw7eLLW/JCM8xPkNsIkKRYgzJz6YPtEY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4722a8e10edcf46aaeb0b9f887bb756e25c6930e",
"lastModified": 1638979957,
"narHash": "sha256-wXANwB0Iwt+G18BIzSs3i/6A1hyLzwsKBrqzMTCA81M=",
"owner": "rust-analyzer",
"repo": "rust-analyzer",
"rev": "020242ff0e503f650bbfe8b10866e9e22f937236",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"mozillapkgs": "mozillapkgs",
"naersk": "naersk",
"nixpkgs": "nixpkgs_2",
"utils": "utils"
"owner": "rust-analyzer",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"utils": {

22
flake.nix
View File

@ -2,22 +2,20 @@
inputs = {
utils.url = "github:numtide/flake-utils";
naersk.url = "github:nmattia/naersk";
mozillapkgs.url = "github:mozilla/nixpkgs-mozilla";
mozillapkgs.flake = false;
naersk.inputs.nixpkgs.follows = "nixpkgs";
fenix.url = "github:nix-community/fenix";
fenix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, utils, naersk, mozillapkgs }:
outputs = { self, nixpkgs, utils, naersk, fenix }:
utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages."${system}";
mozilla = pkgs.callPackage (mozillapkgs + "/package-set.nix") {};
rust = (mozilla.rustChannelOf {
channel = "stable";
date = "2021-12-02";
sha256 = "0rqgx90k9lhfwaf63ccnm5qskzahmr4q18i18y6kdx48y26w3xz8";
}).rust.override {
#extensions = [ "clippy-preview" "rustfmt-preview" "miri-preview" ];
extensions = [ "clippy-preview" "rustfmt-preview" ];
};
rust = fenix.packages.${system}.stable.withComponents [
"cargo"
"rustc"
"rustfmt"
"clippy"
];
# Override the version used in naersk
naersk-lib = naersk.lib."${system}".override {