Add profiles

Merge pull request #258 from hercules-ci/flake-update
`flake.lock`: Update
2024-10-01 16:23:38 +02:00 · 2024-08-05 02:44:33 +00:00 · 2024-08-05 02:38:38 +00:00 · 2024-07-05 02:50:08 +00:00 · 2024-07-05 02:38:52 +00:00 · 2024-06-26 13:17:50 +02:00
6 changed files with 22 additions and 21 deletions
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@ -148,7 +148,7 @@ Describe containers using NixOS-style modules. There are a few options:
  project.name = "full-nixos";
  services.webserver = { pkgs, lib, ... }: {
    nixos.useSystemd = true;
-    nixos.configuration.boot.tmpOnTmpfs = true;
+    nixos.configuration.boot.tmp.useTmpfs = true;
    nixos.configuration.services.nginx.enable = true;
    nixos.configuration.services.nginx.virtualHosts.localhost.root = "${pkgs.nix.doc}/share/doc/nix/manual";
    nixos.configuration.services.nscd.enable = false;
--- a/examples/full-nixos/arion-compose.nix
+++ b/examples/full-nixos/arion-compose.nix
@ -2,7 +2,7 @@
  project.name = "full-nixos";
  services.webserver = { pkgs, lib, ... }: {
    nixos.useSystemd = true;
-    nixos.configuration.boot.tmpOnTmpfs = true;
+    nixos.configuration.boot.tmp.useTmpfs = true;
    nixos.configuration.networking.useDHCP = false;
    nixos.configuration.services.nginx.enable = true;
    nixos.configuration.services.nginx.virtualHosts.localhost.root = "${pkgs.nix.doc}/share/doc/nix/manual";
--- a/flake.lock
+++ b/flake.lock
@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
+        "lastModified": 1712014858,
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
        "type": "github"
      },
      "original": {
@ -64,11 +64,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704029560,
-        "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
+        "lastModified": 1719226092,
+        "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
+        "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
        "type": "github"
      },
      "original": {
@ -79,11 +79,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1706913249,
-        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
+        "lastModified": 1722630782,
+        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e92b6015881907e698782c77641aa49298330223",
+        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -86,12 +86,6 @@
      flake = {
        debug = { inherit inputs config lib; };

-        defaultPackage =
-          lib.mapAttrs
-            (ps: lib.warn "arion.defaultPackage has been removed in favor of arion.packages.\${system}.default"
-              ps.default)
-            config.flake.packages;
-
        lib = {
          eval = import ./src/nix/eval-composition.nix;
          build = args@{ ... }:
--- a/src/haskell/testdata/Arion/NixSpec/arion-compose.nix
+++ b/src/haskell/testdata/Arion/NixSpec/arion-compose.nix
@ -2,7 +2,7 @@
  project.name = "unit-test-data";
  services.webserver = { pkgs, ... }: {
    nixos.useSystemd = true;
-    nixos.configuration.boot.tmpOnTmpfs = true;
+    nixos.configuration.boot.tmp.useTmpfs = true;
    nixos.configuration.services.nginx.enable = true;
    nixos.configuration.services.nginx.virtualHosts.localhost.root = "${pkgs.nix.doc}/share/doc/nix/manual";
    service.useHostStore = true;
--- a/src/nix/modules/service/docker-compose-service.nix
+++ b/src/nix/modules/service/docker-compose-service.nix
@ -210,6 +210,11 @@ in
      default = [];
      description = serviceRef "external_links";
    };
+    service.profiles = mkOption {
+      type = listOf str;
+      default = [];
+      description = serviceRef "profiles";
+    };
    service.extra_hosts = mkOption {
      type = listOf str;
      default = [];
@ -411,5 +416,7 @@ in
    inherit (config.service) working_dir;
  } // lib.optionalAttrs (config.service.user != null) {
    inherit (config.service) user;
+  } // lib.optionalAttrs (config.service.profiles != []) {
+    inherit (config.service) profiles;
  };
 }
Author	SHA1	Message	Date
GHOSCHT	ec4f2a836d	Add profiles	2024-10-01 16:23:38 +02:00
hercules-ci[bot]	90bc855327	Merge pull request #258 from hercules-ci/flake-update `flake.lock`: Update	2024-08-05 02:44:33 +00:00
Hercules CI Effects	16c4d4d8b8	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6' (2024-07-03) → 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02)	2024-08-05 02:38:38 +00:00
hercules-ci[bot]	236f9dd82d	Merge pull request #253 from hercules-ci/flake-update `flake.lock`: Update	2024-07-05 02:50:08 +00:00
Hercules CI Effects	ab9bdaf08f	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/c0302ec12d569532a6b6bd218f698bc402e93adc' (2024-04-23) → 'github:hercules-ci/hercules-ci-effects/11e4b8dc112e2f485d7c97e1cee77f9958f498f5' (2024-06-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31) → 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6' (2024-07-03)	2024-07-05 02:38:52 +00:00
Robert Hensing	555e7ba634	Merge pull request #241 from tomeon/remove-defaultPackage chore(flake): remove `defaultPackage` output	2024-06-26 13:17:50 +02:00
Robert Hensing	01777136c6	Merge pull request #248 from KiaraGrouwstra/rename-tmpfs-option rename boot.tmpOnTmpfs -> boot.tmp.useTmpfs	2024-06-24 08:01:23 +02:00
Kiara Grouwstra	8f0549b434	rename boot.tmpOnTmpfs -> boot.tmp.useTmpfs resolves warning: trace: Obsolete option `boot.tmpOnTmpfs' is used. It was renamed to `boot.tmp.useTmpfs'. c.f. `a5d95ac5fc`	2024-06-12 22:14:14 +00:00
hercules-ci[bot]	c24c185e67	Merge pull request #245 from hercules-ci/flake-update `flake.lock`: Update	2024-06-05 02:52:18 +00:00
Hercules CI Effects	d917218d05	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02) → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31)	2024-06-05 02:38:23 +00:00
hercules-ci[bot]	e9945eb6cd	Merge pull request #242 from hercules-ci/flake-update `flake.lock`: Update	2024-05-05 02:48:07 +00:00
Hercules CI Effects	0449d31ffb	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/64e7763d72c1e4c1e5e6472640615b6ae2d40fbf' (2024-03-15) → 'github:hercules-ci/hercules-ci-effects/c0302ec12d569532a6b6bd218f698bc402e93adc' (2024-04-23) • Updated input 'hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19) → 'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02)	2024-05-05 02:38:58 +00:00
Matt Schreiber	7e7aa3dfc6	chore(flake): remove `defaultPackage` output Follow-up to #240.	2024-04-28 20:35:20 -04:00
Robert Hensing	efa008e12f	Merge pull request #240 from tomeon/defaultPackage-eval-fix fix(flake): allow `defaultPackage` to evaluate	2024-04-28 20:30:18 +02:00
Matt Schreiber	df306b74bc	fix(flake): allow `defaultPackage` to evaluate by adding the missing (and in this case ignored) key/attribute-name argument to `lib.mapAttrs`.	2024-04-28 11:55:23 -04:00
hercules-ci[bot]	add0e67d2b	Merge pull request #239 from hercules-ci/flake-update `flake.lock`: Update	2024-04-21 19:36:12 +00:00
Hercules CI Effects	c8c61a3c67	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fd281bd6b7d3e32ddfa399853946f782553163b5' (2024-04-03) → 'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19)	2024-04-21 17:53:24 +00:00
hercules-ci[bot]	1886d25075	Merge pull request #236 from hercules-ci/flake-update `flake.lock`: Update	2024-04-05 02:50:56 +00:00
Hercules CI Effects	c2cc3dae34	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/0ca27bd58e4d5be3135a4bef66b582e57abe8f4a' (2024-02-21) → 'github:hercules-ci/hercules-ci-effects/64e7763d72c1e4c1e5e6472640615b6ae2d40fbf' (2024-03-15) • Updated input 'hercules-ci-effects/flake-parts': 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03) → 'github:NixOS/nixpkgs/fd281bd6b7d3e32ddfa399853946f782553163b5' (2024-04-03)	2024-04-05 02:39:24 +00:00
hercules-ci[bot]	d2d48c9ec3	Merge pull request #233 from hercules-ci/flake-update `flake.lock`: Update	2024-03-05 02:44:05 +00:00
Hercules CI Effects	c1597ef64b	flake.lock: Update Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01) → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/d5cbf433a6ae9cae05400189a8dbc6412a03ba16' (2023-12-31) → 'github:hercules-ci/hercules-ci-effects/0ca27bd58e4d5be3135a4bef66b582e57abe8f4a' (2024-02-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8' (2024-02-11) → 'github:NixOS/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03)	2024-03-05 02:38:52 +00:00
hercules-ci[bot]	2b1fa9a8e9	Merge pull request #232 from hercules-ci/flake-update `flake.lock`: Update	2024-02-14 15:12:56 +00:00
Hercules CI Effects	4fb872dc07	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e92b6015881907e698782c77641aa49298330223' (2024-02-02) → 'github:NixOS/nixpkgs/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8' (2024-02-11)	2024-02-14 14:56:50 +00:00
Robert Hensing	39ee2bc7f7	Merge pull request #231 from EricTheMagician/docker-build add support for more docker-compose build options	2024-02-14 15:54:56 +01:00