From 2c355dbbc7c0f9bca04f4a180b9aa87fde19e6f7 Mon Sep 17 00:00:00 2001
From: Danila Danko <br4ch1st0chr0n3@gmail.com>
Date: Mon, 24 Jul 2023 13:55:29 +0300
Subject: [PATCH] upd flake

---
 flake.lock       |  6 +++---
 flake.nix        | 46 +++++++++++++++++-----------------------------
 nix-files/ci.nix | 10 ++++++++--
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 858a66b58..d66d5669f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flakes": {
       "locked": {
-        "lastModified": 1690058004,
-        "narHash": "sha256-IVGeaNhr3D7rtjTtNKC1srhMcxGul00RQ0L5vLahj7I=",
+        "lastModified": 1690190523,
+        "narHash": "sha256-5x360IfqIwxOK4oIAfE5old2wxmOniaW45qvJblJqlM=",
         "owner": "deemp",
         "repo": "flakes",
-        "rev": "ab518bf41bc7723e16fbfec086b759887c3ffc89",
+        "rev": "11e0ab649d184b72068caa05c548bbf6add2536e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2aa9057e3..087c4dbdc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,37 +1,25 @@
 {
   inputs.flakes.url = "github:deemp/flakes";
-
-  outputs =
-    inputs@{ self, ... }:
-    let
-      inputs_ =
-        let flakes = inputs.flakes.flakes; in
-        {
-          inherit (flakes.source-flake) flake-utils nixpkgs formatter terrafix;
-          inherit (flakes) codium drv-tools devshell flakes-tools workflows env2json json2md;
-          python-tools = flakes.language-tools.python;
-          purescript-tools = flakes.language-tools.purescript;
-          app_python = import ./app_python;
-          app_purescript = import ./app_purescript;
-          root = import ./.;
-          inherit flakes;
-        };
-
-      outputs = outputs_ { } // { inputs = inputs_; outputs = outputs_; };
-
-      outputs_ =
-        inputs__:
-        let inputs = inputs_ // inputs__; in
-        inputs.flake-utils.lib.eachDefaultSystem (system:
-        let
-          inherit (import ./nix-files/default.nix { inherit inputs system; }) devShells packages;
-        in
+  outputs = inputs:
+    let flakes = inputs.flakes; in
+    flakes.makeFlake {
+      inputs = {
+        inherit (inputs.flakes.all)
+          nixpkgs formatter terrafix codium drv-tools devshell
+          flakes-tools workflows haskell-tools env2json json2md
+          python-tools;
+        app_python = import ./app_python;
+        app_purescript = import ./app_purescript;
+        root = import ./.;
+        inherit flakes;
+      };
+      perSystem = { inputs, system }:
+        let inherit (import ./nix-files/default.nix { inherit inputs system; }) devShells packages; in
         {
           inherit devShells packages;
           formatter = inputs.formatter.${system};
-        });
-    in
-    outputs;
+        };
+    };
 
   nixConfig = {
     extra-substituters = [
diff --git a/nix-files/ci.nix b/nix-files/ci.nix
index d0de97fa5..107cab683 100644
--- a/nix-files/ci.nix
+++ b/nix-files/ci.nix
@@ -35,12 +35,18 @@ let
       linuxGCEnabled = true;
       linuxMaxStoreSize = 4000000000;
     };
-    steps = _: [
+    steps = { dir, stepsAttrs }: [
       {
         name = "Run writers";
         run = run.nixScript { name = inputs.root.packages.${system}.writeAll.pname; };
       }
-      (steps.commit { messages = [ (steps.updateLocks { }).name (steps.format { }).name "Run writers" ]; })
+      (steps.commit {
+        messages = [
+          (steps.updateLocks { }).name
+          (steps.format { }).name
+          stepsAttrs."Run writers".name
+        ];
+      })
     ];
   };