Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ inputs.freeze = {
...

pkgs = import nixpkgs {
inherit system;
overlays = [
freeze.overlays.default # Add freeze to overlays when importing nixpkgs
];
Expand Down
58 changes: 12 additions & 46 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
description = "";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -19,7 +18,6 @@
{
self,
nixpkgs,
flake-utils,
crane,
rust-overlay,
...
Expand All @@ -33,7 +31,8 @@
let
# Building patcher with fixed nixpkgs from this flake
pkgs = import nixpkgs {
system = prev.system;
inherit (final) config;
inherit (final.stdenv.hostPlatform) system;
overlays = [ (import rust-overlay) ];
};
craneLib = crane.mkLib pkgs;
Expand Down Expand Up @@ -70,7 +69,8 @@
# search for mod.nu for directories like `use` does
# binName: name of the resulting binary in "bin/" of derivation
wrapScript = lib.wrapScript pkgs;
} // (prev.nushell-freeze or { });
}
// (prev.nushell-freeze or { });
};

packages =
Expand All @@ -84,15 +84,16 @@
pkgs = pkgs;
inputs = inputs;
};
} // (prev.nushell-freeze or { });
}
// (prev.nushell-freeze or { });
};
};

homeManagerModule = (import ./lib { }).homeManagerModule;
}
// flake-utils.lib.eachDefaultSystem (
system:
// (
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [
Expand All @@ -113,8 +114,8 @@
patcher = import lib/patcher { inherit craneLib; };
in
{
checks = import ./checks { inherit pkgs; } // patcher.checks;
devShells.default = craneLib.devShell { };
checks.${system} = import ./checks { inherit pkgs; } // patcher.checks;
devShells.${system}.default = craneLib.devShell { };
}
);
}
Loading
Loading