Merge pull request #65 from blackheaven/fix/sync-after-restructuration

fix: update security-advisory to restore (#64)

Author: MangoIV

.github/workflows/haskell-ci.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Freeze
         run: cabal freeze
       - name: Cache
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.setup-haskell.outputs.cabal-store }}
           key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}

cabal-audit.cabal

@@ -84,6 +84,7 @@ library
     , filepath
     , fused-effects
     , hsec-core
+    , hsec-sync
     , hsec-tools
     , http-client
     , kan-extensions

cabal.project

@@ -6,24 +6,36 @@ source-repository-package
   type: git
   subdir: code/hsec-tools
   location: https://github.com/haskell/security-advisories.git
-  tag: add617d5026bd31cad2bdbe8259b5f67381db246
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
+
+source-repository-package
+  type: git
+  subdir: code/hsec-sync
+  location: https://github.com/haskell/security-advisories.git
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
 
 source-repository-package
   type: git
   subdir: code/hsec-core
   location: https://github.com/haskell/security-advisories.git
-  tag: add617d5026bd31cad2bdbe8259b5f67381db246
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
 
 source-repository-package
   type: git
   subdir: code/cvss
   location: https://github.com/haskell/security-advisories.git
-  tag: add617d5026bd31cad2bdbe8259b5f67381db246
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
 
-source-repository-package
+source-repository-packagep
   type: git
   subdir: code/osv
   location: https://github.com/haskell/security-advisories.git
-  tag: add617d5026bd31cad2bdbe8259b5f67381db246
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
+
+source-repository-packagep
+  type: git
+  subdir: code/purl
+  location: https://github.com/haskell/security-advisories.git
+  tag: fc3453aa95edb296b1e4409f53d1c1210b479fc8
 
 test-show-details: direct

flake.nix

@@ -85,15 +85,15 @@
             name = "regen-cabal-audit-nix";
             runtimeInputs = [pkgs.cabal2nix pkgs.alejandra];
             text = let
-              v = "ef73a3748f31d8df1557546b26d2d587cdacf459";
+              v = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
               cmd = pkg: ''
                 cabal2nix https://github.com/haskell/security-advisories.git \
                   --revision ${v} \
                   --subpath code/${pkg}/ > ./${pkg}.nix
               '';
             in ''
               pushd "$PRJ_ROOT"/nix
-              ${lib.concatStrings (map cmd ["osv" "cvss" "hsec-core" "hsec-tools"])}
+              ${lib.concatStrings (map cmd ["osv" "purl" "cvss" "hsec-core" "hsec-sync" "hsec-tools"])}
               cabal2nix ../. > ./cabal-audit.nix
               alejandra ./.
               popd

nix/cabal-audit.nix

@@ -11,6 +11,7 @@
   filepath,
   fused-effects,
   hsec-core,
+  hsec-sync,
   hsec-tools,
   hspec,
   http-client,
@@ -46,6 +47,7 @@ mkDerivation {
     filepath
     fused-effects
     hsec-core
+    hsec-sync
     hsec-tools
     http-client
     kan-extensions

nix/cvss.nix

@@ -9,11 +9,11 @@
 }:
 mkDerivation {
   pname = "cvss";
-  version = "0.2";
+  version = "0.2.0.1";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
-    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
+    sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
+    rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/cvss/; echo source root reset to $sourceRoot";

nix/haskell-overlay.nix

@@ -1,8 +1,10 @@
-{hlib, ...}: hfinal: hprev: {
+_: hfinal: hprev: {
   cabal-audit = hfinal.callPackage ./cabal-audit.nix {};
   osv = hfinal.callPackage ./osv.nix {};
-  hsec-core = hlib.doJailbreak (hfinal.callPackage ./hsec-core.nix {});
-  hsec-tools = hlib.doJailbreak (hfinal.callPackage ./hsec-tools.nix {});
+  purl = hfinal.callPackage ./purl.nix {};
+  hsec-core = hfinal.callPackage ./hsec-core.nix {};
+  hsec-sync = hfinal.callPackage ./hsec-sync.nix {};
+  hsec-tools = hfinal.callPackage ./hsec-tools.nix {};
   cvss = hfinal.callPackage ./cvss.nix {};
 
   Cabal-syntax = hprev.Cabal-syntax_3_12_1_0;

nix/haskell-shell.nix

@@ -2,9 +2,11 @@
   shellFor,
   haskell-language-server,
   fourmolu,
+  cabal-audit,
   ...
 }:
 shellFor {
   packages = hps: [hps.cabal-audit];
   nativeBuildInputs = [haskell-language-server fourmolu];
+  inputsFrom = [cabal-audit.env];
 }

nix/hsec-core.nix

@@ -15,11 +15,11 @@
 }:
 mkDerivation {
   pname = "hsec-core";
-  version = "0.2.0.1";
+  version = "0.2.1.0";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
-    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
+    sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
+    rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/hsec-core/; echo source root reset to $sourceRoot";
@@ -33,7 +33,14 @@ mkDerivation {
     text
     time
   ];
-  testHaskellDepends = [base cvss tasty tasty-hunit text];
+  testHaskellDepends = [
+    base
+    Cabal-syntax
+    cvss
+    tasty
+    tasty-hunit
+    text
+  ];
   description = "Core package representing Haskell advisories";
   license = lib.licenses.bsd3;
 }

nix/hsec-sync.nix

@@ -0,0 +1,63 @@
+{
+  mkDerivation,
+  base,
+  bytestring,
+  directory,
+  either,
+  extra,
+  fetchgit,
+  filepath,
+  http-client,
+  lens,
+  lib,
+  optparse-applicative,
+  tar,
+  tasty,
+  tasty-hunit,
+  temporary,
+  text,
+  transformers,
+  wreq,
+  zlib,
+}:
+mkDerivation {
+  pname = "hsec-sync";
+  version = "0.2.0.2";
+  src = fetchgit {
+    url = "https://github.com/haskell/security-advisories.git";
+    sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
+    rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/code/hsec-sync/; echo source root reset to $sourceRoot";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    base
+    bytestring
+    directory
+    either
+    extra
+    filepath
+    http-client
+    lens
+    tar
+    temporary
+    text
+    transformers
+    wreq
+    zlib
+  ];
+  executableHaskellDepends = [base optparse-applicative];
+  testHaskellDepends = [
+    base
+    directory
+    filepath
+    tasty
+    tasty-hunit
+    temporary
+  ];
+  description = "Synchronize with the Haskell security advisory database";
+  license = lib.licenses.bsd3;
+  mainProgram = "hsec-sync";
+}