From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 23 May 2020 01:36:16 +0000 (+0200)
Subject: Upgrade environment
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=f9914beb086a06e290287f299ae2c2026924a780

Upgrade environment
---

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index e726c59..dddc1fd 100644
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -4,7 +4,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
   paths = [
     # archives
-    lzo unzip bzip2 p7zip xz
+    lzo unzip bzip2 xz
     # unrar is unfree
 
     # backups
@@ -123,7 +123,7 @@ let
 
     # Terraform + AWS
     terraform_0_12 awscli
-    (ansible.override { python2 = python3; }) python3Packages.boto
+    ansible python3Packages.boto
     openvpn
 
     zsh-completions
diff --git a/overlays/vdirsyncer/default.nix b/overlays/khal/default.nix
similarity index 50%
rename from overlays/vdirsyncer/default.nix
rename to overlays/khal/default.nix
index 53248f9..597cc0e 100644
--- a/overlays/vdirsyncer/default.nix
+++ b/overlays/khal/default.nix
@@ -1,10 +1,4 @@
 self: super: {
-  vdirsyncer = super.vdirsyncer.overridePythonAttrs(old: {
-    # https://github.com/NixOS/nixpkgs/pull/85809
-    postPatch = old.postPatch + ''
-      sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
-    '';
-  });
   khal = super.khal.overridePythonAttrs(old: {
     postPatch = ''
       sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py