diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-23 03:36:16 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-23 03:36:16 +0200 |
commit | f9914beb086a06e290287f299ae2c2026924a780 (patch) | |
tree | 4fe815abf6c47c9ff95cf311e1aabc6f7b1e9e9a | |
parent | cfda3cfc35445979225850f686f338e6d4ace372 (diff) | |
download | Nix-f9914beb086a06e290287f299ae2c2026924a780.tar.gz Nix-f9914beb086a06e290287f299ae2c2026924a780.tar.zst Nix-f9914beb086a06e290287f299ae2c2026924a780.zip |
Upgrade environment
-rw-r--r-- | environments/immae-eu.nix | 4 | ||||
-rw-r--r-- | overlays/khal/default.nix (renamed from overlays/vdirsyncer/default.nix) | 6 |
2 files changed, 2 insertions, 8 deletions
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 | |||
4 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks | 4 | # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks |
5 | paths = [ | 5 | paths = [ |
6 | # archives | 6 | # archives |
7 | lzo unzip bzip2 p7zip xz | 7 | lzo unzip bzip2 xz |
8 | # unrar is unfree | 8 | # unrar is unfree |
9 | 9 | ||
10 | # backups | 10 | # backups |
@@ -123,7 +123,7 @@ let | |||
123 | 123 | ||
124 | # Terraform + AWS | 124 | # Terraform + AWS |
125 | terraform_0_12 awscli | 125 | terraform_0_12 awscli |
126 | (ansible.override { python2 = python3; }) python3Packages.boto | 126 | ansible python3Packages.boto |
127 | openvpn | 127 | openvpn |
128 | 128 | ||
129 | zsh-completions | 129 | zsh-completions |
diff --git a/overlays/vdirsyncer/default.nix b/overlays/khal/default.nix index 53248f9..597cc0e 100644 --- a/overlays/vdirsyncer/default.nix +++ b/overlays/khal/default.nix | |||
@@ -1,10 +1,4 @@ | |||
1 | self: super: { | 1 | self: super: { |
2 | vdirsyncer = super.vdirsyncer.overridePythonAttrs(old: { | ||
3 | # https://github.com/NixOS/nixpkgs/pull/85809 | ||
4 | postPatch = old.postPatch + '' | ||
5 | sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py | ||
6 | ''; | ||
7 | }); | ||
8 | khal = super.khal.overridePythonAttrs(old: { | 2 | khal = super.khal.overridePythonAttrs(old: { |
9 | postPatch = '' | 3 | postPatch = '' |
10 | sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py | 4 | sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py |