Erik Arvstedt
9a283a038d
nixos-container: fix nixpkgs container options being ignored ...
Since the introduction of option `containers.<name>.pkgs`, the
`nixpkgs.*` options (including `nixpkgs.pkgs`, `nixpkgs.config`, ...) were always
ignored in container configs, which broke existing containers.
This was due to `containers.<name>.pkgs` having two separate effects:
(1) It sets the source for the modules that are used to evaluate the container.
(2) It sets the `pkgs` arg (`_module.args.pkgs`) that is used inside the container
modules.
This happens even when the default value of `containers.<name>.pkgs` is unchanged, in which
case the container `pkgs` arg is set to the pkgs of the host system.
Previously, the `pkgs` arg was determined by the `containers.<name>.config.nixpkgs.*` options.
This commit reverts the breaking change (2) while adding a backwards-compatible way to achieve (1).
It removes option `pkgs` and adds option `nixpkgs` which implements (1).
Existing users of `pkgs` are informed by an error message to use option
`nixpkgs` or to achieve only (2) by setting option `containers.<name>.config.nixpkgs.pkgs`.
2021-01-15 12:49:42 +01:00
2020-10-22 14:06:19 +01:00
2020-05-25 09:16:23 +02:00
2020-11-23 08:42:51 +10:00
2020-04-29 14:36:35 +02:00
2020-10-25 11:01:31 +01:00
2020-10-25 11:01:31 +01:00
2020-08-23 22:42:02 +02:00
2020-10-21 18:03:04 +02:00
2020-07-01 00:08:55 +02:00
2020-11-02 21:18:57 +01:00
2020-11-09 22:50:17 +01:00
2020-08-25 17:18:56 +02:00
2020-07-16 08:44:04 +02:00
2020-06-30 17:12:03 +02:00
2020-08-16 16:08:14 +03:00
2020-08-03 14:21:45 +07:00
2020-08-04 00:23:54 +10:00
2020-10-25 11:01:30 +01:00
2020-09-14 22:35:05 +02:00
2020-10-25 11:01:31 +01:00
2020-04-29 23:10:53 +02:00
2020-09-10 01:08:22 +02:00
2020-09-01 14:31:52 +03:00
2020-10-07 00:18:13 +01:00
2020-09-18 12:42:23 +02:00
2020-12-02 03:30:11 -06:00
2020-11-04 12:57:58 -05:00
2020-10-20 17:38:20 +02:00
2020-11-25 13:00:41 -05:00
2020-11-28 13:42:36 -05:00
2020-05-22 11:23:31 +02:00
2020-08-04 00:23:54 +10:00
2020-10-25 11:01:31 +01:00
2020-08-07 04:28:11 +02:00
2020-08-23 07:29:42 +12:00
2020-08-18 07:59:48 +10:00
2020-08-04 00:23:54 +10:00
2020-11-17 13:09:31 +02:00
2020-10-25 11:01:31 +01:00
2020-10-12 20:31:53 -04:00
2020-07-11 14:12:42 +02:00
2020-07-11 14:12:42 +02:00
2020-10-23 18:09:50 -07:00
2020-10-25 11:01:31 +01:00
2020-08-28 14:39:21 +02:00
2020-05-03 22:14:21 -07:00
2020-10-15 01:03:13 +02:00
2020-04-03 00:34:18 +02:00
2020-09-23 11:59:44 +02:00
2020-06-18 03:06:24 +02:00
2021-01-15 12:49:42 +01:00
2020-08-04 00:23:54 +10:00
2020-08-23 11:00:54 +02:00
2020-10-25 11:01:31 +01:00
2020-10-25 11:01:31 +01:00
2020-09-11 14:03:16 +02:00
2020-08-24 18:34:19 +10:00
2020-04-18 02:00:04 +02:00
2020-05-04 15:56:06 -07:00
2020-10-26 16:25:37 -04:00
2020-12-02 08:03:38 +01:00
2020-06-26 14:55:52 -07:00
2020-08-18 07:59:48 +10:00
2020-04-07 07:26:47 +01:00
2020-08-23 10:31:58 +02:00
2020-04-29 15:23:50 +02:00
2020-05-24 15:45:22 +02:00
2020-05-25 09:50:24 -03:00
2020-05-26 21:47:31 +02:00
2020-10-23 18:12:45 -07:00
2020-10-31 20:53:15 +01:00
2020-08-10 06:54:26 +02:00
2020-04-14 23:56:42 +02:00
2020-09-07 11:21:26 +02:00
2020-03-29 18:50:19 +00:00
2020-05-10 15:58:54 +02:00
2020-12-02 15:18:47 +01:00
2020-11-21 01:39:08 +01:00
2020-07-14 04:35:15 +02:00
2020-08-23 19:09:59 +02:00
2020-10-25 11:01:30 +01:00
2020-09-12 19:30:17 +02:00
2020-06-29 22:04:23 +12:00
2020-06-24 10:22:53 +02:00
2020-10-25 11:01:30 +01:00
2020-10-05 09:07:21 -04:00
2020-07-07 01:43:44 +02:00
2020-05-25 18:13:14 +02:00
2020-10-25 11:01:30 +01:00
2020-07-06 18:35:34 +02:00
2020-09-07 15:43:37 +02:00
2020-04-13 06:22:27 +02:00
2020-06-17 21:43:04 +00:00
2020-08-04 13:07:36 -07:00
2020-11-28 13:42:36 -05:00
2020-04-17 16:39:54 +02:00
2020-06-20 15:31:47 +02:00
2020-10-29 12:47:10 +01:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-11-10 10:49:27 +01:00
2020-11-28 13:42:36 -05:00
2020-09-09 19:30:02 +02:00
2020-09-09 20:07:17 +02:00
2020-03-30 16:15:15 +02:00
2020-09-22 23:27:12 -07:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-10-08 08:59:49 +02:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:31 +01:00
2020-11-28 12:43:17 -05:00
2020-11-28 12:43:17 -05:00
2020-05-02 04:20:00 -05:00
2020-12-01 17:36:04 +01:00
2020-07-24 11:04:33 +02:00
2020-08-04 00:23:54 +10:00
2020-11-23 08:42:51 +10:00
2020-04-10 17:54:53 +01:00
2020-10-07 13:35:50 +02:00
2020-11-16 14:00:34 -05:00
2020-11-06 18:59:51 +01:00
2020-09-25 20:56:15 +02:00
2020-10-25 11:01:30 +01:00
2020-11-25 20:08:03 +01:00
2020-11-02 08:16:01 -05:00
2020-04-12 08:12:50 -04:00
2020-05-12 20:03:29 +03:00
2020-09-10 08:19:20 +03:00
2020-06-02 21:55:48 +12:00
2020-04-12 08:12:50 -04:00
2020-10-12 22:03:16 -04:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-11-04 20:37:50 -05:00
2020-11-21 16:13:03 +00:00
2020-08-23 10:25:31 +02:00
2020-11-24 12:42:06 -05:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-08-09 01:52:25 +02:00
2020-07-09 21:15:35 -04:00
2020-12-01 22:20:11 +10:00
2020-09-02 19:22:43 +01:00
2020-11-12 20:00:50 +01:00
2020-08-26 17:06:48 -04:00
2020-10-24 16:41:34 -04:00
2020-05-09 12:11:44 +02:00
2020-11-06 17:00:47 +01:00
2020-11-01 14:33:11 +01:00
2020-07-29 19:45:03 +02:00
2020-06-08 11:21:53 +12:00
2020-11-23 08:42:51 +10:00
2020-04-07 07:26:47 +01:00
2020-06-23 12:02:27 +02:00
2020-04-22 08:36:27 +02:00
2020-07-06 10:30:43 -04:00
2020-11-17 13:09:31 +02:00
2020-08-31 15:22:50 +02:00
2020-04-10 12:00:00 +00:00
2020-12-01 13:10:43 +00:00
2020-09-29 08:07:53 +02:00
2020-11-23 17:13:22 +03:00
2020-11-11 09:32:06 -05:00
2020-11-04 11:30:36 -05:00
2020-11-05 08:32:28 -05:00
2020-07-09 21:15:35 -04:00
2020-10-25 11:01:30 +01:00
2020-08-09 15:34:30 -07:00
2020-09-13 19:28:51 +02:00
2020-07-02 15:39:47 +02:00
2020-08-02 17:09:57 +02:00
2020-05-12 18:49:43 +02:00
2020-10-25 11:01:30 +01:00
2020-04-12 08:12:50 -04:00
2020-10-25 11:01:30 +01:00
2020-11-21 16:13:03 +00:00
2020-08-24 10:10:47 -04:00
2020-06-23 16:49:50 +02:00
2020-04-07 07:26:47 +01:00
2020-10-25 11:01:31 +01:00
2020-08-04 00:23:54 +10:00
2020-10-25 11:01:29 +01:00
2020-10-25 11:01:29 +01:00
2020-05-18 11:28:03 +02:00
2020-07-06 12:07:50 -07:00
2020-04-23 01:00:51 +02:00
2020-11-02 09:07:52 +01:00
2020-04-22 00:12:00 +10:00
2020-08-25 22:29:22 +02:00
2020-10-13 22:39:02 +02:00
2020-08-30 21:03:27 +02:00
2020-11-27 15:09:19 +01:00
2020-07-27 12:12:17 +03:00
2020-06-06 17:06:23 +02:00
2020-11-18 21:42:01 +01:00
2020-08-04 00:23:54 +10:00
2020-10-25 11:01:30 +01:00
2020-04-12 22:50:36 +02:00
2020-06-05 11:57:36 +02:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-04-03 17:30:35 +02:00
2020-11-30 16:21:41 -03:00
2020-05-03 22:14:21 -07:00
2020-11-03 19:21:25 +01:00
2020-10-25 11:01:30 +01:00
2020-10-25 11:01:30 +01:00
2020-09-02 22:18:52 +08:00
2020-11-30 16:34:53 +09:00
2020-10-25 11:01:30 +01:00
2020-11-24 12:42:06 -05:00
2020-06-19 16:44:21 +02:00
2020-10-25 11:01:31 +01:00
2020-08-18 07:59:44 +10:00
2020-07-09 21:15:35 -04:00
2020-10-12 14:48:07 +02:00
2020-11-16 22:13:13 -05:00
2020-07-25 16:34:20 +02:00
2020-11-11 18:45:14 +01:00
2020-07-20 21:48:14 +02:00
2020-05-17 14:14:30 -04:00
9a283a038d