summaryrefslogtreecommitdiff
path: root/modules/common/nix.nix
diff options
context:
space:
mode:
Diffstat (limited to 'modules/common/nix.nix')
-rw-r--r--modules/common/nix.nix41
1 files changed, 8 insertions, 33 deletions
diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index fec9b80..233edda 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -24,36 +24,11 @@ in
config =
let
- useNixpkgs =
- nixpkgs:
- import nixpkgs {
- inherit (config.nixpkgs) config;
- inherit (this) system;
- };
-
- pkgsLocal = useNixpkgs "${config.my.home}/src/nixpkgs"; # Impure!
- pkgsMaster = useNixpkgs inputs.nixpkgs-master;
- pkgsStable = useNixpkgs inputs.nixpkgs-stable;
- pkgsRev =
- rev: hash:
- useNixpkgs (
- pkgs.fetchFromGitHub {
- owner = "NixOS";
- repo = "nixpkgs";
- inherit rev hash;
- }
- );
- pkgsPR = pr: pkgsRev "refs/pull/${toString pr}/head";
+ pkgsLocal = packages.useNixpkgs "${config.my.home}/src/nixpkgs"; # Impure!
in
{
_module.args = {
- inherit
- pkgsLocal
- pkgsMaster
- pkgsStable
- pkgsRev
- pkgsPR
- ;
+ inherit pkgsLocal;
};
hm = {
@@ -126,12 +101,12 @@ in
overlays = with inputs; [
self.overlays.default
- (_: _prev: {
- # Global PR package overrides go here. Example:
- # ```
- # inherit (pkgsPR 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
- # ```
- })
+ # (_: _prev: with packages; {
+ # # Global PR package overrides go here. Example:
+ # # ```
+ # # inherit (package.formPR 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
+ # # ```
+ # })
];
};