From 9ae50a8275ef77aa28aac5adc983eb34d7243270 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 6 Dec 2021 21:38:15 +0100 Subject: [PATCH] vmd32387: update to nixos 21.11 --- nix/os/containers/backup-target.nix | 1 + nix/os/devices/167.233.1.14/versions.nix | 17 +++++++++++------ nix/os/devices/167.233.1.14/versions.tmpl.nix | 9 +++++++-- .../versions.tmpl.nix | 9 +++++++-- nix/variables/passwords.crypt.nix | Bin 1282 -> 1303 bytes 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/nix/os/containers/backup-target.nix b/nix/os/containers/backup-target.nix index 6ac91a0..40d348e 100644 --- a/nix/os/containers/backup-target.nix +++ b/nix/os/containers/backup-target.nix @@ -19,6 +19,7 @@ users.extraUsers."${containerBackupCfg.user}" = { uid = 2000; + group = containerBackupCfg.group; shell = pkgs.bashInteractive; home = "/${containerBackupCfg.targetPath}"; openssh.authorizedKeys.keys = [ diff --git a/nix/os/devices/167.233.1.14/versions.nix b/nix/os/devices/167.233.1.14/versions.nix index cae9773..ef51563 100644 --- a/nix/os/devices/167.233.1.14/versions.nix +++ b/nix/os/devices/167.233.1.14/versions.nix @@ -1,18 +1,23 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.05"; - rev = "a1007637cea374bd1bafd754cfd5388894c49129"; + ref = "nixos-21.11"; + rev = "e34c5379866833f41e2a36f309912fa675d687c7"; }; in { inherit nixpkgs; "channels-nixos-stable" = nixpkgs; + "channels-nixos-21.05" = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "nixos-21.05"; + rev = ""; + }; "channels-nixos-20.09" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-20.09"; - rev = "068984c00e0d4e54b6684d98f6ac47c92dcb642e"; + rev = "1c1f5649bb9c1b0d98637c8c365228f57126f361"; }; "channels-nixos-20.03" = { url = "https://github.com/NixOS/nixpkgs/"; @@ -27,16 +32,16 @@ in "channels-nixos-unstable" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-unstable"; - rev = "253aecf69ed7595aaefabde779aa6449195bebb7"; + rev = "c71f061c68ba8ce53471b767d5049cbd0f3d8490"; }; "nixpkgs-master" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "master"; - rev = "77506e4f258f1922148986a73a713006318e9fe9"; + rev = "fb881b80f64d1b672135533a8c2fbc86e6ed8898"; }; "home-manager-module" = { url = "https://github.com/nix-community/home-manager"; ref = "release-21.05"; - rev = "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef"; + rev = "7329ffc6e911106494183557fc249180d5422929"; }; } diff --git a/nix/os/devices/167.233.1.14/versions.tmpl.nix b/nix/os/devices/167.233.1.14/versions.tmpl.nix index f05d0dc..2ad257f 100644 --- a/nix/os/devices/167.233.1.14/versions.tmpl.nix +++ b/nix/os/devices/167.233.1.14/versions.tmpl.nix @@ -1,14 +1,19 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.05"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-21.11"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; }; in { inherit nixpkgs; "channels-nixos-stable" = nixpkgs; + "channels-nixos-21.05" = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "nixos-21.05"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.05 | awk '{ print $1 }' | tr -d '\n' -%>"; + }; "channels-nixos-20.09" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-20.09"; diff --git a/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix b/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix index 0fbcb19..30642d3 100644 --- a/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix +++ b/nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix @@ -1,8 +1,8 @@ let nixpkgs = { url = "https://github.com/NixOS/nixpkgs/"; - ref = "nixos-21.05"; - rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>"; + ref = "nixos-21.11"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>"; }; in @@ -12,6 +12,11 @@ in suffix = "/nixos"; }; "channels-nixos-stable" = nixpkgs; + "channels-nixos-21.05" = { + url = "https://github.com/NixOS/nixpkgs/"; + ref = "nixos-21.05"; + rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.05 | awk '{ print $1 }' | tr -d '\n' -%>"; + }; "channels-nixos-20.09" = { url = "https://github.com/NixOS/nixpkgs/"; ref = "nixos-20.09"; diff --git a/nix/variables/passwords.crypt.nix b/nix/variables/passwords.crypt.nix index d91b7826de01e0cfb3b25c70337aab6d67dcad89..3b2898134915be5c77974dda3325e7fbea6f3c99 100644 GIT binary patch literal 1303 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 GO(p;Ys(xeu