fix(cvss): adapt nix setup

haskell · Nov 17, 2023 · 784e478 · 784e478
1 parent 30ba2a2
commit 784e478
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/code/cabal.project b/code/cabal.project
@@ -0,0 +1,4 @@
+packages: */*.cabal
+
+package hsec-tools
+package cvss
diff --git a/code/cvss/CHANGELOG.md b/code/cvss/CHANGELOG.md
@@ -0,0 +1,3 @@
+# 0.1
+
+Introduction
diff --git a/code/hsec-tools/cabal.project b/code/hsec-tools/cabal.project
diff --git a/flake.nix b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     toml-parser = {
-      url = github:glguy/toml-parser/eb7222d9d71aa00d0a37f85ff4cdef89d1ba743d; # v1.3.0.0
+      url = "github:glguy/toml-parser/eb7222d9d71aa00d0a37f85ff4cdef89d1ba743d"; # v1.3.0.0
       flake = false;
     };
   };
@@ -19,13 +19,16 @@
         jailbreakUnbreak = pkg:
           pkgs.haskell.lib.doJailbreak (pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.unmarkBroken pkg));
 
-        project = returnShellEnv:
+        cvss = pkgs.haskellPackages.callCabal2nix "cvss" ./code/cvss {};
+
+        hsec-tools = returnShellEnv:
           pkgs.haskellPackages.developPackage {
             inherit returnShellEnv;
             name = "hsec-tools";
             root = ./code/hsec-tools;
             withHoogle = false;
-            overrides = self: super: with pkgs.haskell.lib; {
+            overrides = self: super: {
+              inherit cvss;
               Cabal-syntax = super.Cabal-syntax_3_8_1_0;
               toml-parser = jailbreakUnbreak (super.callCabal2nix "toml-parser" toml-parser { });
             };
@@ -52,8 +55,8 @@
           };
       in
       {
-
-        packages.hsec-tools = pkgs.haskell.lib.justStaticExecutables (project false);
+        packages.cvss = cvss;
+        packages.hsec-tools = pkgs.haskell.lib.justStaticExecutables (hsec-tools false);
         packages.hsec-tools-image =
           pkgs.dockerTools.buildImage {
             name = "haskell/hsec-tools";
@@ -89,6 +92,6 @@
         defaultPackage = self.packages.${system}.hsec-tools;
 
         # Used by `nix develop` (dev shell)
-        devShell = project true;
+        devShell = hsec-tools true;
       });
 }