replace shell.nix with haskell.nix Flake

Author: peterbecich

.envrc

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

.github/workflows/nix-shell.yml renamed to .github/workflows/nix-flake.yml

@@ -1,4 +1,4 @@
-name: "Test nix-shell"
+name: "Test Nix Flake"
 on:
   push:
     branches:
@@ -15,7 +15,6 @@ jobs:
     - uses: actions/[email protected]
     - uses: cachix/install-nix-action@v18
       with:
-        nix_path: nixpkgs=channel:nixos-21.11
         extra_nix_config: |
           trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hackage-server.cachix.org-1:iw0iRh6+gsFIrxROFaAt5gKNgIHejKjIfyRdbpPYevY=
           substituters = https://hydra.iohk.io https://cache.nixos.org/ https://hackage-server.cachix.org/
@@ -24,4 +23,5 @@ jobs:
         # https://nix.dev/tutorials/continuous-integration-github-actions#setting-up-github-actions
         name: hackage-server
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-shell --pure --run ./.github/workflows/test-nix-shell.sh
+    - run: nix build
+    - run: nix flake check

.github/workflows/test-nix-shell.sh

@@ -15,3 +15,4 @@ tags
 *.swp
 TAGS
 *~
+.direnv

.gitignore

@@ -2,23 +2,24 @@
 
 [![Build Status](https://travis-ci.org/haskell/hackage-server.png?branch=master)](https://travis-ci.org/haskell/hackage-server)
 [![Build status](https://github.com/haskell/hackage-server/actions/workflows/haskell-ci.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/haskell-ci.yml)
-[![Build status](https://github.com/haskell/hackage-server/actions/workflows/nix-shell.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/nix-shell.yml)
+[![Build status](https://github.com/haskell/hackage-server/actions/workflows/nix-flake.yml/badge.svg)](https://github.com/haskell/hackage-server/actions/workflows/nix-flake.yml)
 
 This is the `hackage-server` code. This is what powers <http://hackage.haskell.org>, and many other private hackage instances. The `master` branch is suitable for general usage. Specific policy and documentation for the central hackage instance exists in the `central-server` branch.
 
 ## Installing dependencies
 
 `hackage-server` depends on `libgd` and `zlib`. You'll also need `libbrotli-dev` for enabling tests.
 
-### [`nix-shell`](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html)
+### [`nix develop`](https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-develop.html)
 
-If you have the [Nix package manager](https://nixos.org/) installed, the easiest way to run `hackage-server` is by using the `nix-shell`. It should be unnecessary to install any dependencies manually. In this repository:
+If you have the [Nix package manager](https://nixos.org/) installed, the easiest way to run `hackage-server` is by using `nix develop`. It should be unnecessary to install any dependencies manually. In this repository:
 
-    nix-shell --pure
+    nix develop
 
-    [nix-shell]$ cabal v2-run -- hackage-server init
+    (in develop shell)
+    $ cabal v2-run -- hackage-server init
 
-    [nix-shell]$ cabal v2-run -- hackage-server run --static-dir=datafiles/ --base-uri=http://127.0.0.1:8080
+    $ cabal v2-run -- hackage-server run --static-dir=datafiles/ --base-uri=http://127.0.0.1:8080
     hackage-server: Ready! Point your browser at http://127.0.0.1:8080
 
 ### Manually

README.md

@@ -8,7 +8,6 @@
 
 packages: .
 
-
 allow-newer: rss:time, rss:base
 
 -- Andreas, 2022-10-28:  `Cabal-3.8.1.0` wants `process >= 1.6.14`

cabal.project

@@ -357,15 +357,22 @@ runAction opts = do
                -> return n
       _        -> fail $ "bad port number " ++ show str
 
+      -- Just authority <- uriAuthority guessURI
+      -- let portStr | port == 80 = ""
+
+    checkHostURI :: ServerConfig -> Maybe String -> Int -> IO URI
     checkHostURI defaults Nothing port = do
       let guessURI       = confHostUri defaults
-          Just authority = uriAuthority guessURI
+      case uriAuthority guessURI of
+        Nothing -> fail "No URI Authority"
+        Just authority -> let
           portStr | port == 80 = ""
                   | otherwise  = ':' : show port
           guessURI' = guessURI { uriAuthority = Just authority { uriPort = portStr } }
-      lognotice verbosity $ "Guessing public URI as " ++ show guessURI'
+          in do
+          lognotice verbosity $ "Guessing public URI as " ++ show guessURI'
                         ++ "\n(you can override with the --base-uri= flag)"
-      return guessURI'
+          return guessURI'
 
     checkHostURI _        (Just str) _ = case parseAbsoluteURI str of
       Nothing -> fail $ "Cannot parse as a URI: " ++ str ++ "\n"