Skip to content

Commit

Permalink
[#849] Use a more recent version of nixpkgs
Browse files Browse the repository at this point in the history
…for scripts and infrastructure to meet the requirements stated in the
terraform configuration

In this commit, changes have been made to the `flake.nix` file to
utilize a more recent version of nixpkgs for both scripts and
infrastructure. The modifications ensure that the scripts and
infrastructure align with the specified requirements in the terraform
configuration. Specifically, the nodePkgs import has been updated to
allow unfree packages, and the packages.scripts and packages.infra
sections have been adjusted to utilize the nodePkgs instead of
defaultPkgs. This adjustment guarantees that the scripts and
infrastructure components are in line with the necessary configurations,
enhancing compatibility and meeting the user story's demands.
  • Loading branch information
placek committed Apr 24, 2024
1 parent c780dd8 commit 66fa5f6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
flake-utils.lib.eachDefaultSystem (system:
let
defaultPkgs = import default_nixpkgs { inherit system; config.allowBroken = true; };
nodePkgs = import node_nixpkgs { inherit system; };
nodePkgs = import node_nixpkgs { inherit system; config.allowUnfree = true; };
frontend = nodePkgs.callPackage ./govtool/frontend { pkgs = nodePkgs; };
in
{
packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = defaultPkgs; };
packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = defaultPkgs; };
packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = nodePkgs; };
packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = nodePkgs; };
packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; };
packages.frontendModules = frontend.nodeModules;
packages.frontend = frontend.staticSite;
Expand Down

0 comments on commit 66fa5f6

Please sign in to comment.