From 52c8798dbf31cee737c961d055a8cb38801ed19e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 9 Jun 2022 01:56:30 +0200 Subject: [PATCH] Drop NixOS 20.09 support --- CHANGELOG.md | 5 +++++ nix/ci.nix | 7 ------- nix/sources.json | 12 ------------ 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bea61da..7baeb3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Next +### Removed + + - NixOS 20.09 support. Its docker-compose does not support the + `networks..name` option, which is important in later versions. + ### Changed * Healthcheck-based dependencies in `service.depends_on`. diff --git a/nix/ci.nix b/nix/ci.nix index 5dacffd..1e53108 100644 --- a/nix/ci.nix +++ b/nix/ci.nix @@ -5,13 +5,6 @@ let in dimension "Nixpkgs version" { - # avoid bitrotting the docker support (as opposed to podman) - "nixos-20_09" = { - nixpkgsSource = "nixos-20.09"; - enableDoc = true; - dockerSupportsSystemd = true; - nixosHasPodmanDockerSocket = false; - }; "nixos-22_05" = { nixpkgsSource = "nixos-22.05"; enableDoc = true; diff --git a/nix/sources.json b/nix/sources.json index 6b3e284..037ef0c 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -11,18 +11,6 @@ "url": "https://github.com/nmattia/niv/archive/fad2a6cbfb2e7cdebb7cb0ad2f5cc91e2c9bc06b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "nixos-20.09": { - "branch": "nixos-20.09", - "description": "Nix Packages collection", - "homepage": null, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cfe5377e8993052f9b0dd56d058f8008af45bd9", - "sha256": "0i3ybddi2mrlaz3di3svdpgy93zwmdglpywih4s9rd3wj865gzn1", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/0cfe5377e8993052f9b0dd56d058f8008af45bd9.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "nixos-22.05": { "branch": "nixos-22.05", "description": "Nix Packages collection",