Upgrade environment

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index e726c59f1107348ca40fa75bbe8507ad53fdb618..dddc1fd10cf7d978e6768f310e266464ab414f95 100644 (file)
--- 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
   # 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
     # unrar is unfree
 
     # backups


@@ -123,7 +123,7 @@ let
 
     # Terraform + AWS
     terraform_0_12 awscli
 
     # Terraform + AWS
     terraform_0_12 awscli

-    (ansible.override { python2 = python3; }) python3Packages.boto
+    ansible python3Packages.boto

     openvpn
 
     zsh-completions
     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 53248f9179d6c169d430a0839669018cbe40f1c1..597cc0edc22c97adbd25704e74f2d7a097510f7c 100644 (file)
--- a/overlays/vdirsyncer/default.nix
+++ b/overlays/khal/default.nix
@@ -1,10 +1,4 @@
 self: super: {
 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
   khal = super.khal.overridePythonAttrs(old: {
     postPatch = ''
       sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py