fix/upstreaming-merge-conflicts #42

Merged
teutat3s merged 26 commits from refs/pull/42/head into main 2021-10-11 22:32:01 +00:00
2 changed files with 8 additions and 3 deletions
Showing only changes of commit 950199ef2c - Show all commits

View file

@ -77,11 +77,14 @@
nur.overlay
agenix.overlay
nvfetcher.overlay
deploy.overlay
./pkgs/default.nix
];
};
latest = { };
latest = {
overlays = [
deploy.overlay
];
};
};
lib = import ./lib { lib = digga.lib // nixos.lib; };

View file

@ -11,7 +11,9 @@ channels: final: prev: {
nixpkgs-fmt
qutebrowser
signal-desktop
starship;
starship
deploy-rs
;
haskellPackages = prev.haskellPackages.override