From 26c48b356154ff03662a2db9b833a20a40c8dadb Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 Jun 2022 14:42:42 +0200
Subject: [PATCH] nix: remove deprecated flake attributes

---
 flake.nix | 87 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/flake.nix b/flake.nix
index 233f242..07513cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,49 +7,54 @@
   };
 
   outputs = { self, nixpkgs, futils } @ inputs:
-    futils.lib.eachDefaultSystem (system:
-      let
-        inherit (nixpkgs) lib;
-        pkgs = nixpkgs.legacyPackages.${system};
-        buildInputs = with pkgs; [
-          gnumake
-          (texlive.combine {
-            inherit (texlive)
-              scheme-small
-              # Build script
-              latexmk
-              # Extra packages needed
-              clearsans
-              fontaxes
-              textpos
-              ifmtarg
-              marvosym
-              ;
-          })
-        ];
-      in
-      {
-        devShell = pkgs.mkShell {
-          name = "cv";
-          inherit buildInputs;
-        };
+    futils.lib.eachDefaultSystem
+      (system:
+        let
+          inherit (nixpkgs) lib;
+          pkgs = nixpkgs.legacyPackages.${system};
+          buildInputs = with pkgs; [
+            gnumake
+            (texlive.combine {
+              inherit (texlive)
+                scheme-small
+                # Build script
+                latexmk
+                # Extra packages needed
+                clearsans
+                fontaxes
+                textpos
+                ifmtarg
+                marvosym
+                ;
+            })
+          ];
+        in
+        {
+          devShells = {
+            default = pkgs.mkShell {
+              name = "cv";
+              inherit buildInputs;
+            };
+          };
 
-        defaultPackage = pkgs.stdenvNoCC.mkDerivation {
-          pname = "cv";
-          version = self.rev or "dirty";
-          src = ./.;
+          packages = {
+            default = pkgs.stdenvNoCC.mkDerivation {
+              pname = "cv";
+              version = self.rev or "dirty";
+              src = ./.;
 
-          inherit buildInputs;
+              inherit buildInputs;
 
-          buildPhase = ''
-            make
-          '';
+              buildPhase = ''
+                make
+              '';
 
-          installPhase = ''
-            install -Dm644 en.pdf $out/share/en.pdf
-            install -Dm644 fr.pdf $out/share/fr.pdf
-          '';
-        };
-      }
-    );
+              installPhase = ''
+                install -Dm644 en.pdf $out/share/en.pdf
+                install -Dm644 fr.pdf $out/share/fr.pdf
+              '';
+            };
+          };
+        }
+      );
 }