Merge staging to master #12

Merged
steveej merged 30 commits from staging into master 2018-11-10 11:10:55 +00:00
2 changed files with 4 additions and 1 deletions
Showing only changes of commit 7572248be0 - Show all commits

View file

@ -88,7 +88,6 @@ in {
nix-prefetch-scripts nix-prefetch-scripts
# Version Control Systems # Version Control Systems
git-crypt
unstablepkgs.pijul unstablepkgs.pijul
gitless gitless
gitRepo gitRepo

View file

@ -50,6 +50,10 @@ in {
home.packages = home.packages =
[] ++ (with pkgs; [ [] ++ (with pkgs; [
# git helpers
git-crypt
vcsh
# Authentication # Authentication
cacert cacert
openssl openssl