From f680e27f303282c5aae8a0b5aee215b6fdf0ca65 Mon Sep 17 00:00:00 2001 From: Stefan Boere Date: Fri, 10 Sep 2021 00:10:14 +0200 Subject: [PATCH 1/3] Fix pure nix evaluation nixpkgs-old-chromium By passing the system parameter to nixpkgs-old-chromium. This fixes the error 'attribute currentSystem missing' in pure evaluation mode. --- haskell-overlays/reflex-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 218576631..61535793e 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -20,7 +20,7 @@ let inherit (nixpkgs) stdenv; # Older chromium for reflex-dom-core test suite - nixpkgs_oldChromium = import ../../nixpkgs-old-chromium {}; + nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs) system; }; in { _dep = super._dep or {} // thunkSet ./dep; From 2ae2de3082885e25f5103e4f24c228f146c96a8c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 12 Sep 2021 11:42:22 -0400 Subject: [PATCH 2/3] Prefer to get `system` from `nixpkgs.stdenv` --- haskell-overlays/reflex-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index 61535793e..bf77c54fa 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -20,7 +20,7 @@ let inherit (nixpkgs) stdenv; # Older chromium for reflex-dom-core test suite - nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs) system; }; + nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs.stdenv) system; }; in { _dep = super._dep or {} // thunkSet ./dep; From ceefb5e7367e685147a463684b14c6e0b18fa6c8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 12 Sep 2021 11:48:17 -0400 Subject: [PATCH 3/3] Actually, prefer to get `system` from `...buildPlatform` We are going to run chromium during testing, so it's the build platform. If build != host, (which, granted, we don't yet run tests for) we could run the test app in an emulator, but there is no point running chromium in an emulator too, as JSaddle shouldn't care. --- haskell-overlays/reflex-packages/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix index bf77c54fa..62a00a0a9 100644 --- a/haskell-overlays/reflex-packages/default.nix +++ b/haskell-overlays/reflex-packages/default.nix @@ -20,7 +20,7 @@ let inherit (nixpkgs) stdenv; # Older chromium for reflex-dom-core test suite - nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs.stdenv) system; }; + nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs.stdenv.buildPlatform) system; }; in { _dep = super._dep or {} // thunkSet ./dep;