From 54079bfbc300b8270207f11a7aaea42950a82385 Mon Sep 17 00:00:00 2001 From: Oleg Lebedev Date: Wed, 15 Feb 2023 21:51:51 +1100 Subject: [PATCH 1/4] fix nixos option refference --- nixos-module.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos-module.nix b/nixos-module.nix index b1a865f..ec57442 100644 --- a/nixos-module.nix +++ b/nixos-module.nix @@ -46,7 +46,7 @@ let }; arionSettingsType = name: - (cfg.package.eval { modules = [ { project.name = lib.mkDefault name; } ]; }).type or ( + (cfg.package.eval { modules = [{ project.name = lib.mkDefault name; }]; }).type or ( throw "lib.evalModules did not produce a type. Please upgrade Nixpkgs to nixos-unstable or >=nixos-21.11" ); @@ -64,7 +64,7 @@ in }; package = mkOption { type = types.package; - + default = (import ./. { inherit pkgs; }).arion; description = '' Arion package to use. This will provide arion @@ -97,7 +97,7 @@ in virtualisation.docker.enable = false; virtualisation.podman.enable = true; virtualisation.podman.dockerSocket.enable = true; - virtualisation.podman.defaultNetwork.settings.dns_enabled = true; + virtualisation.podman.defaultNetwork.dnsname.enable = true; virtualisation.arion.docker.client.package = pkgs.docker-client; }) From 379724cdcd8a63c291646b44cc2b1d92677279e1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 16 Feb 2023 20:44:25 +0100 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/7930f5b1c356270cec420d4f4cb43f4907206640' (2023-01-05) → 'github:hercules-ci/flake-parts/47478a4a003e745402acf63be7f9a092d51b83d7' (2023-02-09) • Updated input 'haskell-flake': 'github:srid/haskell-flake/4fc511d93a55fedf815c1647ad146c26d7a2054e' (2022-11-11) → 'github:srid/haskell-flake/34641d4508c2ad00d1a5ef5fb592f49bfa9e2770' (2023-02-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e' (2023-01-11) → 'github:NixOS/nixpkgs/545c7a31e5dedea4a6d372712a18e00ce097d462' (2023-02-13) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index efed274..c93f43f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1672877861, - "narHash": "sha256-ROnSmsk5grROL6gnHBnSdqlPPBrBJMApCeB7xzY567M=", + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7930f5b1c356270cec420d4f4cb43f4907206640", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1668167720, - "narHash": "sha256-5wDTR6xt9BB3BjgKR+YOjOkZgMyDXKaX79g42sStzDU=", + "lastModified": 1676149835, + "narHash": "sha256-rE/MIjs65pBtYzpyltvoZx4V8GcGkuh04GjlLi4VvTE=", "owner": "srid", "repo": "haskell-flake", - "rev": "4fc511d93a55fedf815c1647ad146c26d7a2054e", + "rev": "34641d4508c2ad00d1a5ef5fb592f49bfa9e2770", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673450908, - "narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=", + "lastModified": 1676300157, + "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e", + "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", "type": "github" }, "original": { From 76a6bdbdb295d514f998f39c91d2a21de6b8f30d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 16 Feb 2023 23:04:20 +0100 Subject: [PATCH 3/4] Resolve warnings and enable in-VM sandbox --- tests/arion-test/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/arion-test/default.nix b/tests/arion-test/default.nix index 6035d0d..75f940d 100644 --- a/tests/arion-test/default.nix +++ b/tests/arion-test/default.nix @@ -31,15 +31,7 @@ in }; # no caches, because no internet - nix.binaryCaches = lib.mkForce []; - - # FIXME: Sandbox seems broken with current version of NixOS test - # w/ writable store. Error: - # machine# error: linking '/nix/store/7r8z2zvhwda85pgpdn5hzzz6hs1njklc-stdenv-linux.drv.chroot/nix/store/6v3y7s4q4wd16hsw393gjpxvcf9159bv-patch-shebangs.sh' to '/nix/store/6v3y7s4q4wd16hsw393gjpxvcf9159bv-patch-shebangs.sh': Operation not permitted - # - # There should be no reason why arion can't run without - # sandboxing, so please re-enable. - nix.useSandbox = false; + nix.settings.substituters = lib.mkForce []; virtualisation.writableStore = true; # Switch to virtualisation.additionalPaths when dropping all NixOS <= 21.05. From 1b65892ea6a92a2d926965c28f9cb20de399793e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 16 Feb 2023 23:28:30 +0100 Subject: [PATCH 4/4] Pin haskell-flake at 0.1.0 --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c93f43f..f80a4d6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,15 +22,16 @@ }, "haskell-flake": { "locked": { - "lastModified": 1676149835, - "narHash": "sha256-rE/MIjs65pBtYzpyltvoZx4V8GcGkuh04GjlLi4VvTE=", + "lastModified": 1675296942, + "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=", "owner": "srid", "repo": "haskell-flake", - "rev": "34641d4508c2ad00d1a5ef5fb592f49bfa9e2770", + "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e", "type": "github" }, "original": { "owner": "srid", + "ref": "0.1.0", "repo": "haskell-flake", "type": "github" } diff --git a/flake.nix b/flake.nix index 4ca2b3c..c623eb2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - haskell-flake.url = "github:srid/haskell-flake"; + haskell-flake.url = "github:srid/haskell-flake/0.1.0"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; };