From 6deb3f4226f401c34607cba721a7376a2314cffc Mon Sep 17 00:00:00 2001 From: 778a69cd <778a69cd@potsda.mn> Date: Wed, 9 Aug 2023 15:28:38 +0200 Subject: [PATCH] nixpkgs-fmt --- flake.nix | 62 +++++++++++++++++++++++++++----------------------- js/default.nix | 2 +- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index 2877905e5..303977c67 100644 --- a/flake.nix +++ b/flake.nix @@ -3,35 +3,39 @@ inputs.nixpkgs.url = "github:erictapen/nixpkgs/mobilizon-3"; - outputs = { self, nixpkgs }: let - pkgs = import nixpkgs { system = "x86_64-linux"; }; - in { + outputs = { self, nixpkgs }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + in + { + + packages.x86_64-linux.mobilizon = pkgs.callPackage ./. { + src = ./.; + mobilizon-js = self.packages.x86_64-linux.mobilizon-frontend; + }; + + packages.x86_64-linux.mobilizon-frontend = pkgs.callPackage ./js { }; + + packages.x86_64-linux.default = self.packages.x86_64-linux.mobilizon; + + devShells.x86_64-linux.default = + let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + in + pkgs.mkShell { + buildInputs = with pkgs; [ + elixir + mix2nix + cmake + imagemagick + (yarn.override { + nodejs = nodejs-18_x; + }) + yarn2nix + nodejs-18_x + ]; + }; - packages.x86_64-linux.mobilizon = pkgs.callPackage ./. { - src = ./.; - mobilizon-js = self.packages.x86_64-linux.mobilizon-frontend; }; - - packages.x86_64-linux.mobilizon-frontend = pkgs.callPackage ./js { - }; - - packages.x86_64-linux.default = self.packages.x86_64-linux.mobilizon; - - devShells.x86_64-linux.default = let - pkgs = import nixpkgs { system = "x86_64-linux"; }; - in pkgs.mkShell { - buildInputs = with pkgs; [ - elixir - mix2nix - cmake - imagemagick - (yarn.override { - nodejs = nodejs-18_x; - }) - yarn2nix - nodejs-18_x - ]; - }; - - }; } diff --git a/js/default.nix b/js/default.nix index 3c94ff650..30b258543 100644 --- a/js/default.nix +++ b/js/default.nix @@ -1,4 +1,4 @@ -{ lib, yarn, mkYarnPackage, imagemagick}: +{ lib, yarn, mkYarnPackage, imagemagick }: mkYarnPackage rec { src = ./.;