From 314c1a6e288e9977f1748cc62dbc0b952e18ac5f Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 7 Apr 2024 12:57:09 +0200 Subject: [PATCH 1/4] configuration/common: Fix missing import for networking.nix --- configuration/common/default.nix | 1 + configuration/common/networking.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration/common/default.nix b/configuration/common/default.nix index 0539f43..d3f068d 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -6,6 +6,7 @@ ./backup.nix ./locale.nix + ./networking.nix ./nix.nix ./programs.nix ./ssh.nix diff --git a/configuration/common/networking.nix b/configuration/common/networking.nix index b2d3bb9..77e5f1b 100644 --- a/configuration/common/networking.nix +++ b/configuration/common/networking.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { From 5aac90a1fabcef7ffd981f10d513c60d93b3bb05 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 7 Apr 2024 20:03:10 +0200 Subject: [PATCH 2/4] hosts/hydra-1,hosts/hydra-2: Allow github uri in restricted mode --- hosts/hydra-1/configuration.nix | 2 +- hosts/hydra-2/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 027f0d9..7a6fad8 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -26,7 +26,7 @@ networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ]; nix = { - settings.allowed-uris = "http:// https://"; + settings.allowed-uris = "http:// https:// github:"; distributedBuilds = true; buildMachines = [ { diff --git a/hosts/hydra-2/configuration.nix b/hosts/hydra-2/configuration.nix index 5397517..dee0d0a 100644 --- a/hosts/hydra-2/configuration.nix +++ b/hosts/hydra-2/configuration.nix @@ -26,7 +26,7 @@ networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ]; # Allow Hydra to fetch remote URLs in restricted mode - nix.settings.allowed-uris = "http:// https://"; + nix.settings.allowed-uris = "http:// https:// github:"; services.openssh.settings= { PermitRootLogin = "yes"; From 0b7f25e01734bf2907a0907bfcfc6b8be46b5480 Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 7 Apr 2024 20:36:50 +0200 Subject: [PATCH 3/4] hosts/hydra-1,hosts/hydra-2: Allow http as schema in restricted mode and not only as prefix --- hosts/hydra-1/configuration.nix | 2 +- hosts/hydra-2/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 7a6fad8..7bd2095 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -26,7 +26,7 @@ networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ]; nix = { - settings.allowed-uris = "http:// https:// github:"; + settings.allowed-uris = "http: https: github:"; distributedBuilds = true; buildMachines = [ { diff --git a/hosts/hydra-2/configuration.nix b/hosts/hydra-2/configuration.nix index dee0d0a..8dc1418 100644 --- a/hosts/hydra-2/configuration.nix +++ b/hosts/hydra-2/configuration.nix @@ -26,7 +26,7 @@ networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ]; # Allow Hydra to fetch remote URLs in restricted mode - nix.settings.allowed-uris = "http:// https:// github:"; + nix.settings.allowed-uris = "http: https: github:"; services.openssh.settings= { PermitRootLogin = "yes"; From 9f26dc21218c7a22bdae244a7e8f305309561935 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Mon, 8 Apr 2024 03:03:57 +0200 Subject: [PATCH 4/4] Update nixpkgs 2024-04-08-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 65e82b1..5672aa4 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": {