steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Pr/move contabo containers and backup #77

Merged
steveej merged 7 commits from pr/move-contabo-containers-and-backup into master 2021-01-11 10:54:04 +00:00
Conversation 1 Commits 7 Files changed 29 +4 -1
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dc6405d991 - Show all commits

3
nix/os/devices/vmd32387.contaboserver.net/versions.tmpl.nix
View file

@ -8,6 +8,9 @@ in
{ {
inherit nixpkgs; inherit nixpkgs;
nixos = nixpkgs // {
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;
"channels-nixos-20.03" = { "channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";

2
nix/pkgs/default.nix
View file

@ -44,7 +44,7 @@ in rec {
nixpkgsWithPhp5 = pkgs.fetchFromGitHub { nixpkgsWithPhp5 = pkgs.fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "nixpkgs-channels"; repo = "nixpkgs-channels";
rev = "pkgs"; rev = "846d8f8305192dcc3a63139102698b4ac6b9ef9f";
sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb"; sha256 = "1qifgc1q2i4g0ivpfjnxp4jl2cc82gfjws08dsllgw7q7kw4b4rb";
}; };
php5 = (pkgs.callPackage "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" { php5 = (pkgs.callPackage "${nixpkgsWithPhp5}/pkgs/development/interpreters/php/default.nix" {