summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-10-16 13:49:10 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-25 00:04:29 +0200
commit4fa343dcd0b797d765ee8a3dfc14833d212b7491 (patch)
tree0ec8fc27fc1a160c3784290921921f274611208c
parenta24ab80ab801e2e71d4531393c5fdc9420b60de3 (diff)
downloadNUR-4fa343dcd0b797d765ee8a3dfc14833d212b7491.tar.gz
NUR-4fa343dcd0b797d765ee8a3dfc14833d212b7491.tar.zst
NUR-4fa343dcd0b797d765ee8a3dfc14833d212b7491.zip
Add some tools to immae-eu env
-rw-r--r--overlays/environments/immae-eu.nix4
-rw-r--r--overlays/pelican/default.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix
index a5e277e2..db1caa4d 100644
--- a/overlays/environments/immae-eu.nix
+++ b/overlays/environments/immae-eu.nix
@@ -35,7 +35,7 @@ let
35 bogofilter fetchmail 35 bogofilter fetchmail
36 36
37 # git 37 # git
38 vcsh gitRepo gitAndTools.stgit tig 38 vcsh gitRepo gitAndTools.stgit tig ripgrep
39 39
40 # graphical tools 40 # graphical tools
41 nextcloud-client firefox 41 nextcloud-client firefox
@@ -109,7 +109,7 @@ let
109 s6-portable-utils 109 s6-portable-utils
110 110
111 # other tools 111 # other tools
112 pgloader s3cmd lftp jq cpulimit libxslt 112 pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
113 113
114 # Terraform + AWS 114 # Terraform + AWS
115 terraform_0_12 awscli 115 terraform_0_12 awscli
diff --git a/overlays/pelican/default.nix b/overlays/pelican/default.nix
index 5f60b8f7..5a487aa6 100644
--- a/overlays/pelican/default.nix
+++ b/overlays/pelican/default.nix
@@ -1,6 +1,6 @@
1self: super: { 1self: super: {
2 pelican = with self.python3Packages; 2 pelican = with self.python3Packages;
3 pelican.overrideAttrs(old: self.mylibs.fetchedGithub ./pelican.json // { 3 pelican.overrideAttrs(old: self.mylibs.fetchedGithub ./pelican.json // {
4 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml ]; 4 propagatedBuildInputs = old.propagatedBuildInputs ++ [ pyyaml markdown ];
5 }); 5 });
6} 6}