[chore] documentation update for #21

[chore] repair adjust nix dev env

README.md

@@ -18,8 +18,9 @@ To install `cabal-audit`, you can use Nix by running the following command:
 nix run github:mangoiv/cabal-audit -- --help
 ```
 
-If you don't use `nix`, you can also build from source with `cabal` or
-[download a static executable from one of the latest workflow runs](https://github.com/MangoIV/cabal-audit/releases/tag/nightly).
+If you don't use `nix`, you can also build from source with `cabal`. Just clone the repository and run `cabal install`.
+
+You can also [download a static executable from one of the latest workflow runs](https://github.com/MangoIV/cabal-audit/releases/tag/nightly).
 
 > [!Note]
 > We also have a `cachix`. If you trust me (which I do not recommend, never trust anybody!), run `cachix use cabal-audit` to 
@@ -90,6 +91,9 @@ dependency "process" at version 1.6.17.0 is vulnerable for:
 
 ## Contributing
 
-Contributions are welcome. This repo is flake-enabled. To setup a `devShell`, run `nix develop` or `direnv allow`.
+Contributions are welcome. 
+
+Building the project in a non-nix environment should be as easy as `cabal build`, the build is tested against multiple ghc versions and operating systems in the CI so it should always work with one of these. If you don't use nix, installing the necessary tooling is as always possible with [ghcup](https://www.haskell.org/ghcup/).
 
+This repo is flake-enabled. To setup a `devShell`, run `nix develop` or `direnv allow`.
 If you change dependencies, please run `regen-nix` to regenerate the nix derivations.

flake.nix

@@ -69,7 +69,7 @@
           ];
           devshell = {
             name = "cabal-audit";
-            packagesFrom = [(import ./nix/haskell-shell.nix {inherit pkgs hspkgs;})];
+            packagesFrom = [(import ./nix/haskell-shell.nix {inherit hspkgs;})];
             packages = [pkgs.cabal2nix pkgs.alejandra];
             startup.pre-commit.text = config.pre-commit.installationScript;
           };

nix/cvss.nix

@@ -12,8 +12,8 @@ mkDerivation {
   version = "0.1";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "064w3hca4kpaysjp7mnfk3ggvf4l11i7a8qqjiw05j96zhs5cgnc";
-    rev = "ed728d3aeb69add3f1f62d205cbb5b59a99aa4f0";
+    sha256 = "16n0cck9i7f2ws6rmmrlcqw2yp18v0xsg6w56giv29vx90yadqp2";
+    rev = "1f8e5699f7bc96dcc069d3675ef6b95710ccfbde";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/cvss/; echo source root reset to $sourceRoot";

nix/haskell-overlay.nix

@@ -7,4 +7,6 @@ _: hfinal: hprev: {
 
   toml-parser = hprev.toml-parser_2_0_0_0;
   Cabal-syntax = hprev.Cabal-syntax_3_10_3_0;
+  Cabal = hprev.Cabal_3_10_3_0;
+  extensions = hprev.extensions.override {inherit (hfinal) Cabal;};
 }

nix/haskell-shell.nix

@@ -1,13 +1,5 @@
-{
-  pkgs,
-  hspkgs,
-  ...
-}:
+{hspkgs, ...}:
 hspkgs.shellFor {
   packages = hps: [hps.cabal-audit];
-
-  nativeBuildInputs = [
-    pkgs.haskell-language-server
-    pkgs.haskellPackages.fourmolu
-  ];
+  nativeBuildInputs = [hspkgs.haskell-language-server hspkgs.fourmolu];
 }

nix/hsec-core.nix

@@ -18,8 +18,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "064w3hca4kpaysjp7mnfk3ggvf4l11i7a8qqjiw05j96zhs5cgnc";
-    rev = "ed728d3aeb69add3f1f62d205cbb5b59a99aa4f0";
+    sha256 = "16n0cck9i7f2ws6rmmrlcqw2yp18v0xsg6w56giv29vx90yadqp2";
+    rev = "1f8e5699f7bc96dcc069d3675ef6b95710ccfbde";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/hsec-core/; echo source root reset to $sourceRoot";

nix/hsec-tools.nix

@@ -39,8 +39,8 @@ mkDerivation {
   version = "0.1.0.0";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "064w3hca4kpaysjp7mnfk3ggvf4l11i7a8qqjiw05j96zhs5cgnc";
-    rev = "ed728d3aeb69add3f1f62d205cbb5b59a99aa4f0";
+    sha256 = "16n0cck9i7f2ws6rmmrlcqw2yp18v0xsg6w56giv29vx90yadqp2";
+    rev = "1f8e5699f7bc96dcc069d3675ef6b95710ccfbde";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/hsec-tools/; echo source root reset to $sourceRoot";

nix/osv.nix

@@ -12,11 +12,11 @@
 }:
 mkDerivation {
   pname = "osv";
-  version = "0.1.0.0";
+  version = "0.1.0.1";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "064w3hca4kpaysjp7mnfk3ggvf4l11i7a8qqjiw05j96zhs5cgnc";
-    rev = "ed728d3aeb69add3f1f62d205cbb5b59a99aa4f0";
+    sha256 = "16n0cck9i7f2ws6rmmrlcqw2yp18v0xsg6w56giv29vx90yadqp2";
+    rev = "1f8e5699f7bc96dcc069d3675ef6b95710ccfbde";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/osv/; echo source root reset to $sourceRoot";