flake: avoid ifd (#70)

This commit is contained in:
figsoda 2023-02-20 05:23:48 -05:00 committed by GitHub
parent f0267dfb72
commit ec55198a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 36 deletions

View File

@ -21,26 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1635165013,
"narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1645013224, "lastModified": 1645013224,
@ -60,7 +40,6 @@
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },

View File

@ -8,22 +8,14 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
gitignore = {
url = "github:hercules-ci/gitignore.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
{ self { self
, nixpkgs , nixpkgs
, fenix , fenix
, gitignore
}: }:
let let
inherit (gitignore.lib) gitignoreSource;
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: nixpkgsFor = forAllSystems (system:
@ -32,12 +24,7 @@
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default ];
}); });
chanspec = { rustChannel = p: (fenix.overlay p p).fenix.complete;
date = "2022-02-06";
channel = "nightly";
sha256 = "oKkTWopCDx4tphzTtRn+zDDtvmIZrL/H44tV2ruSfDw="; # set zeros after modifying channel or date
};
rustChannel = p: (fenix.overlay p p).fenix.toolchainOf chanspec;
in in
{ {
@ -59,7 +46,7 @@
src = self; src = self;
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
buildFeatures = "json"; buildFeatures = [ "json" ];
meta = with lib; { meta = with lib; {
description = "Lints and suggestions for the Nix programming language"; description = "Lints and suggestions for the Nix programming language";