nix: create overlay and use it throughout the repo

This commit is contained in:
steveej 2019-01-26 23:59:31 +01:00
parent 213aa184b1
commit d38563f4a1
5 changed files with 11 additions and 6 deletions

View file

@ -25,9 +25,6 @@ in {
dropbearStatic = dropbear.override { dropbearStatic = dropbear.override {
enableStatic = true; enableStatic = true;
}; };
just = pkgs.callPackage ../../pkgs/just.nix {};
duplicacy = pkgs.callPackage ../../pkgs/duplicacy {};
}; };
}; };

View file

@ -5,7 +5,6 @@
let let
keys = import ../../../variables/keys.nix; keys = import ../../../variables/keys.nix;
mfcl3770cdw = pkgs.callPackage ../../../pkgs/mfcl3770cdw.nix {};
in { in {
# TASK: new device # TASK: new device

View file

@ -1,6 +1,10 @@
{ ... }: { ... }:
{ {
nixpkgs.overlays = [
(import ../../../overlay.nix)
];
imports = [ imports = [
./boot.nix ./boot.nix
./pkg.nix ./pkg.nix

5
nix/overlay.nix Normal file
View file

@ -0,0 +1,5 @@
self: super: {
duplicay = super.callPackage ./pkgs/duplicacy {};
mfcl3770cdw = super.callPackage ./pkgs/mfcl3770cdw.nix {};
just = super.callPackage ./pkgs/just.nix {};
}

View file

@ -2,7 +2,7 @@
let let
channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/7e88992a8c7b2de0bcb89182d8686b27bd93e46a.tar.gz); channels-nixos-stable-path = (builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/7e88992a8c7b2de0bcb89182d8686b27bd93e46a.tar.gz);
channels-nixos-stable = import channels-nixos-stable-path {}; channels-nixos-stable = import channels-nixos-stable-path { overlays = [ (import ./nix/overlay.nix) ]; };
in in
with channels-nixos-stable; with channels-nixos-stable;
@ -10,7 +10,7 @@ stdenv.mkDerivation {
name = "infra-env"; name = "infra-env";
buildInputs = [ buildInputs = [
(with import (channels-nixos-stable-path+"/nixos") { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]) (with import (channels-nixos-stable-path+"/nixos") { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ])
(pkgs.callPackage ./nix/pkgs/just.nix {}) just
git-crypt git-crypt
vcsh vcsh
gnupg gnupg