Add hints about keeping stack and nix versions in sync

README.md

@@ -6,24 +6,29 @@
 $ nix build
 ```
 
+## Running
+
+```
+$ nix run
+```
+
 ## Building the Docker image
 
 ```
-# TODO
-$ docker load < $(nix-build nix/docker-image.nix)
+$ docker load < $(nix build .#docker --print-out-paths)
 ```
 
 ## Development Shell
 
-Includes Stack, `haskell-language-server`, `gen-hie` etc.
+Includes Stack, GHC, `haskell-language-server`, `gen-hie` etc.
 
 ```
-nix develop
+$ nix develop
 ```
 
 ## Running Stack and GHC
 
 ```
-nix run .#stack
-nix run .#ghc
+$ nix run .#stack
+$ nix run .#ghc
 ```

flake.nix

@@ -57,6 +57,13 @@
         inherit stack;
         inherit utoy;
 
+        docker = 
+          pkgs.dockerTools.buildImage {
+            name = "git.pbrinkmeier.de/paul/utoy";
+            tag = utoy.version;
+            config.Cmd = [ "${utoy}/bin/utoy" ];
+          };
+
         default = utoy;
       };
 

nix/docker-image.nix

@@ -1,9 +0,0 @@
-let
-  pkgs = import ./pkgs.nix {};
-  utoy = import ../utoy.nix;
-in
-  pkgs.dockerTools.buildImage {
-    name = "git.pbrinkmeier.de/paul/utoy";
-    tag = utoy.version;
-    config.Cmd = [ "${utoy}/bin/utoy" ];
-  }

package.yaml

@@ -1,6 +1,7 @@
 # Adapted from new-template.hsfiles
 
 name:                utoy
+# Keep this in sync with the version in flake.nix.
 version:             0.5
 git:                 "https://git.pbrinkmeier.de/paul/utoy"
 license:             MIT

stack.yaml

@@ -1,4 +1,5 @@
 # You can get a working environment using nix develop.
+# Keep this in sync with nix/settings.nix
 resolver: ghc-9.4.4
 packages:
 - .