Merge pull request #67 from MangoIV/mangoiv/updates

[chore] update dependencies and compiler

Author: MangoIV

.github/workflows/cabal-audit.yml

@@ -34,30 +34,3 @@ jobs:
       - name: Build cabal-audit
         run: |
           nix -Lv build
-
-      - name: Build cabal-audit static
-        run: |
-          nix -Lv build .#cabal-audit-static -o result-static
-
-      - name: Create release artifacts
-        run: | 
-          mkdir -p artifacts
-
-          cp result-static/bin/cabal-audit artifacts
-          chmod +x artifacts/cabal-audit
-
-      - name: Upload static cabal-audit exe
-        uses: actions/upload-artifact@v4
-        with:
-          name: cabal-audit
-          path: artifacts/cabal-audit
-
-      - name: Release nightly cabal-audit exe
-        if: github.ref == 'refs/heads/main'
-        uses: softprops/action-gh-release@v2
-        with:
-          prerelease: true
-          tag_name: nightly
-          files: |
-            artifacts/cabal-audit
-          fail_on_unmatched_files: true

cabal-audit.cabal

@@ -22,7 +22,7 @@ maintainer:         [email protected]
 category:           Data
 extra-doc-files:
 extra-source-files:
-tested-with:        GHC ==9.4.8 || ==9.6.6 || ==9.8.2
+tested-with:        GHC ==9.8.4 || ==9.10.3 || ==9.12.2
 
 common common-all
   ghc-options:
@@ -74,7 +74,7 @@ library
 
   build-depends:
     , aeson
-    , base                  <5
+    , base                  >=4.18 && <5
     , bytestring
     , Cabal
     , cabal-install

flake.lock

@@ -3,7 +3,7 @@
   description = "cabal-audit's flake";
   inputs = {
     # flake inputs
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # flake parts
     parts.url = "github:hercules-ci/flake-parts";
@@ -24,7 +24,7 @@
         ...
       }: let
         hlib = pkgs.haskell.lib.compose;
-        hspkgs = pkgs.haskell.packages.ghc98.override {
+        hspkgs = pkgs.haskellPackages.override {
           overrides = import ./nix/haskell-overlay.nix {inherit hlib;};
         };
       in {
@@ -87,7 +87,7 @@
             text = let
               v = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
               cmd = pkg: ''
-                cabal2nix https://github.com/haskell/security-advisories.git \
+                cabal2nix https://github.com/haskell/security-advisories \
                   --revision ${v} \
                   --subpath code/${pkg}/ > ./${pkg}.nix
               '';

flake.nix

@@ -11,7 +11,7 @@ mkDerivation {
   pname = "cvss";
   version = "0.2.0.1";
   src = fetchgit {
-    url = "https://github.com/haskell/security-advisories.git";
+    url = "https://github.com/haskell/security-advisories";
     sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
     rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;

nix/cvss.nix

@@ -1,20 +1,12 @@
-_: hfinal: hprev: {
+{hlib, ...}: hfinal: hprev: {
   cabal-audit = hfinal.callPackage ./cabal-audit.nix {};
   osv = hfinal.callPackage ./osv.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 {};
+  hsec-tools = hlib.doJailbreak (hfinal.callPackage ./hsec-tools.nix {});
   cvss = hfinal.callPackage ./cvss.nix {};
 
-  Cabal-syntax = hprev.Cabal-syntax_3_12_1_0;
-  Cabal = hprev.Cabal_3_12_1_0;
-
-  extensions = hprev.extensions_0_1_0_2.override {inherit (hfinal) Cabal;};
-
-  toml-parser = hfinal.callHackage "toml-parser" "2.0.1.0" {};
-
-  typst = hfinal.callHackage "typst" "0.5.0.5" {};
-  typst-symbols = hfinal.callHackage "typst-symbols" "0.1.6" {};
-  texmath = hfinal.callHackage "texmath" "0.12.8.9" {};
+  Cabal-syntax = hprev.Cabal-syntax_3_16_0_0;
+  Cabal = hprev.Cabal_3_16_0_0;
 }

nix/haskell-overlay.nix

@@ -17,7 +17,7 @@ mkDerivation {
   pname = "hsec-core";
   version = "0.2.1.0";
   src = fetchgit {
-    url = "https://github.com/haskell/security-advisories.git";
+    url = "https://github.com/haskell/security-advisories";
     sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
     rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;

nix/hsec-core.nix

@@ -24,7 +24,7 @@ mkDerivation {
   pname = "hsec-sync";
   version = "0.2.0.2";
   src = fetchgit {
-    url = "https://github.com/haskell/security-advisories.git";
+    url = "https://github.com/haskell/security-advisories";
     sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
     rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;

nix/hsec-sync.nix

@@ -50,7 +50,7 @@ mkDerivation {
   pname = "hsec-tools";
   version = "0.3.0.0";
   src = fetchgit {
-    url = "https://github.com/haskell/security-advisories.git";
+    url = "https://github.com/haskell/security-advisories";
     sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
     rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;

nix/hsec-tools.nix

@@ -14,7 +14,7 @@ mkDerivation {
   pname = "osv";
   version = "0.2.0.0";
   src = fetchgit {
-    url = "https://github.com/haskell/security-advisories.git";
+    url = "https://github.com/haskell/security-advisories";
     sha256 = "114wj60jfdqb95h3fh3k8s0jy2nzya04rchidfdapnn0l5mf3xhn";
     rev = "fc3453aa95edb296b1e4409f53d1c1210b479fc8";
     fetchSubmodules = true;