.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -17,4 +17,4 @@ dist*/
 report.html
 *.bak
 .direnv/
-result
+.envrc

affection.cabal

@@ -16,7 +16,7 @@ homepage:            https://github.com/nek0/affection#readme
 license:             LGPL-3
 license-file:        LICENSE
 author:              nek0
-maintainer:          nek0@nek0.eu
+maintainer:          nek0@chelnok.de
 category:            Game
 build-type:          Simple
 extra-source-files:  ChangeLog.md
@@ -29,7 +29,7 @@ cabal-version:       >=2.0
 
 source-repository head
   type:     git
-  location: https://gitea.nek0.eu/nek0/affection.git
+  location: https://github.com/nek0/affection
 
 flag verbose
   description:       Enable verbose debug messages
@@ -99,7 +99,7 @@ library
   --                    , UndecidableInstances
   hs-source-dirs:      src
   default-language:    Haskell2010
-  ghc-options:       -threaded -Wall
+  ghc-options:       -Wall
   -- Other library packages from which modules are imported.
   build-depends:       base >=4.9 && < 5
                      , sdl2 >= 2.5
@@ -127,11 +127,12 @@ executable example00
   ghc-options:       -threaded -Wall
   default-language:  Haskell2010
   default-extensions: OverloadedStrings
+  if flag(examples)
     build-depends:     base >=4.9 && < 5
                      , affection
                      , sdl2 >= 2.5
                      , stm
-  if !flag(examples)
+  else
     buildable:       False
 
 -- A small game of life implementation
@@ -142,6 +143,7 @@ executable example01
   ghc-options:       -threaded -Wall
   default-language:  Haskell2010
   default-extensions: OverloadedStrings
+  if flag(examples)
     build-depends:     base >=4.9 && < 5
                      , affection
                      , sdl2 >= 2.5
@@ -153,7 +155,7 @@ executable example01
                      , matrix
                      , nanovg >= 0.6.0.0
                      , deepseq
-  if !flag(examples)
+  else
     buildable:       False
 
 -- Another small game of life implementation
@@ -164,6 +166,7 @@ executable example02
   ghc-options:       -threaded -Wall
   default-language:  Haskell2010
   default-extensions: OverloadedStrings
+  if flag(examples)
     build-depends:     base >=4.9 && < 5
                      , affection
                      , sdl2 >= 2.5
@@ -175,5 +178,5 @@ executable example02
                      , matrix
                      , nanovg >= 0.6.0.0
                      , deepseq
-  if !flag(examples)
+  else
     buildable:       False

cabal.project

@@ -1,4 +1,4 @@
-packages: ./*.cabal
+constraints: affection +verbose +examples
-
+profiling: true
-package affection
+packages:
-  flags: +examples
+  ./.

flake.lock

@@ -1,15 +1,12 @@
 {
   "nodes": {
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1694529238,
+        "lastModified": 1659877975,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -20,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700844339,
+        "lastModified": 1663173135,
-        "narHash": "sha256-VRlPYk0eRn1ao75hoA99LGehYhxZH5RlkP1YXpVROHM=",
+        "narHash": "sha256-QL4JZYUlbt0ex78w30XJ0h9idUMj0DBxppyDsoxEPjE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33576fdfce2d11204067d6cfa99a2f990ef2169a",
+        "rev": "5d1ddac9493642d7311a064351e643de9a0e24ee",
         "type": "github"
       },
       "original": {
@@ -38,21 +35,6 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -17,37 +17,21 @@
           pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
 
         packageName = "affection";
-      in rec {
+      in {
         packages.${packageName} = # (ref:haskell-package-def)
-          haskellPackages.callCabal2nixWithOptions packageName self "--flag examples" {
+          haskellPackages.callCabal2nix packageName self rec {
             # Dependency overrides go here
           };
 
         defaultPackage = self.packages.${system}.${packageName};
 
-        apps = {
+        devShell = pkgs.mkShell {
-          example00 = {
-            type = "app";
-            program = "${self.packages.${system}.${packageName}}/bin/example00";
-          };
-          example01 = {
-            type = "app";
-            program = "${self.packages.${system}.${packageName}}/bin/example01";
-          };
-          example02 = {
-            type = "app";
-            program = "${self.packages.${system}.${packageName}}/bin/example02";
-          };
-        };
-
-        devShell = haskellPackages.shellFor {
-          packages = p: [ defaultPackage ];
-          withHoogle = true;
           buildInputs = with haskellPackages; [
             haskell-language-server
             ghcid
             cabal-install
-          ] ++ (builtins.attrValues self.packages.${system});
+          ];
+          inputsFrom = builtins.attrValues self.packages.${system};
         };
       });
 }

hie.yaml

@@ -0,0 +1,2 @@
+cradle:
+  cabal: