merge changes from master

.github/workflows/bench.yml

@@ -5,7 +5,7 @@ jobs:
   benchmarks:
     name: benchmarks
     runs-on: ubuntu-latest
-    container: fossa/haskell-static-alpine:ghc-9.4.7
+    container: fossa/haskell-static-alpine:ghc-9.4.8
 
     steps:
     - uses: dtolnay/rust-toolchain@stable
@@ -32,14 +32,10 @@ jobs:
         sed 's/nixbld:x:\([[:digit:]]*\):$/nixbld:x:\1:nixbld-1,nixbld-2,nixbld-3/' /etc/group > group-changed
         mv group-changed /etc/group
 
-    - name: run our custom nix install script
-      run : ./.github/scripts/install-nix.sh
-      shell: bash
-      env:
-        INPUT_NIX_PATH: "nixpkgs=channel:nixos-unstable"
-        INPUT_EXTRA_NIX_CONFIG: "build-users-group = nixbld"
-        INPUT_INSTALL_URL: ""
-        INPUT_INSTALL_OPTIONS: ""
+    - uses: cachix/install-nix-action@v25
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+        extra_nix_config: "build-users-group = nixbld"
 
     - name: Debugging information
       run: |

.github/workflows/build-all.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
     env:
-      GHC_VERSION: '9.4.7'
+      GHC_VERSION: '9.4.8'
 
 
     defaults:
@@ -23,19 +23,19 @@ jobs:
         include:
         - os: ubuntu-latest
           os-name: Linux
-          container: fossa/haskell-static-alpine:ghc-9.4.7
+          container: fossa/haskell-static-alpine:ghc-9.4.8
           project-file: cabal.project.ci.linux
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
         - os: macos-latest
           os-name: macOS
           project-file: cabal.project.ci.macos
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
         - os: windows-latest
           os-name: Windows
           project-file: cabal.project.ci.windows
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
     steps:
 
@@ -56,7 +56,7 @@ jobs:
       if: ${{ !contains(matrix.os, 'ubuntu') }}
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.8.1.0'
+        cabal-version: '3.10.2.1'
 
     # Set up Rust.
     # This action installs the 'minimal' profile.

.github/workflows/integrations-test.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on:
       group: "FOSSA CLI Runner"
     # Be sure to update the env below too
-    container: fossa/haskell-static-alpine:ghc-9.4.7
+    container: fossa/haskell-static-alpine:ghc-9.4.8
 
     env:
-      GHC_VERSION: '9.4.7'
+      GHC_VERSION: '9.4.8'
 
     steps:
     - uses: dtolnay/rust-toolchain@stable
@@ -41,14 +41,10 @@ jobs:
         sed 's/nixbld:x:\([[:digit:]]*\):$/nixbld:x:\1:nixbld-1,nixbld-2,nixbld-3/' /etc/group > group-changed
         mv group-changed /etc/group
 
-    - name: run our custom nix install script
-      run : ./.github/scripts/install-nix.sh
-      shell: bash
-      env:
-        INPUT_NIX_PATH: "nixpkgs=channel:nixos-unstable"
-        INPUT_EXTRA_NIX_CONFIG: "build-users-group = nixbld"
-        INPUT_INSTALL_URL: ""
-        INPUT_INSTALL_OPTIONS: ""
+    - uses: cachix/install-nix-action@v25
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+        extra_nix_config: "build-users-group = nixbld"
 
     - name: Debugging information
       run: |

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
   linter-check:
     name: linter-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: dtolnay/rust-toolchain@stable
@@ -39,7 +39,7 @@ jobs:
   format-check:
     name: formatter-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: dtolnay/rust-toolchain@stable
@@ -56,7 +56,7 @@ jobs:
   cabal-format-check:
     name: cabal-format-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: actions/checkout@v4
@@ -94,4 +94,4 @@ jobs:
         uses: sudo-bot/action-shellcheck@latest
         with:
             # https://github.com/koalaman/shellcheck#how-to-use
-            cli-args: "*.sh ./.github/scripts/*.sh"
+            cli-args: "*.sh"

.stan.toml

@@ -0,0 +1 @@
+ignore = [{ id = "STAN-0206" }]

Changelog.md

@@ -1,8 +1,15 @@
 # FOSSA CLI Changelog
 
-## v3.9.12
+## v3.9.14
 - `fossa release-group`: Add command to create a FOSSA release group release (`fossa release-group create-release`) [#1409](https://github.com/fossas/fossa-cli/pull/1409).
 
+## v3.9.13
+- Support GIT dependencies in Bundler projects ([#1403](https://github.com/fossas/fossa-cli/pull/1403/files))
+- Reports: Increase the timeout when hitting the report generation API endpoint ([#1412](https://github.com/fossas/fossa-cli/pull/1412)).
+
+## v3.9.12
+- `--detect-dynamic`: Fix deb tatic parsing ([#1401](https://github.com/fossas/fossa-cli/pull/1401)).
+
 ## v3.9.11
 - Licensing: Add new rules for unity licenses. Add the Redis Source Available License.
 

Makefile

@@ -3,7 +3,7 @@ current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 FMT_OPTS := -co -XTypeApplications -o -XImportQualifiedPost
 FIND_OPTS := src test integration-test -type f -name '*.hs'
-GHC_VERSION := 9.4.7
+GHC_VERSION := 9.4.8
 DEV_TOOLS := ghcr.io/fossas/haskell-dev-tools:${GHC_VERSION}
 MOUNTED_DEV_TOOLS_OPTS := --rm
 MOUNTED_DEV_TOOLS_OPTS += --mount "type=bind,source=${current_dir},target=/fossa-cli"

cabal.project

@@ -6,72 +6,13 @@ package spectrometer
   -- Building with file-embed fails on GHC >= 9.2 on Mac OS X when using no optimizations (-O0).
   -- I found that we can keep most of the speed of compiling with -O0 and compile succesfully by enabling this one extension.
   -- In CI, we use either -O1 or -O2 so this should not be a problem.
-  -- 
+  --
   -- When upgrading to GHC 9.4 consumers of spectrometer may also need to enable this flag if they use -O0.
   -- Bug filed here: https://github.com/snoyberg/file-embed/issues/45
   ghc-options: -ffull-laziness
-
-allow-newer:
-  -- git-config needs to relax its upper bound on megaparsec. PR submitted;
-  -- no action from maintainer yet
-  --
-  -- we can remove this if/when 0.1.3 is released on hackage
-  , git-config:megaparsec
-
-  -- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
-  -- was in 2018, so we may have to fork when breakage occurs
-  , codec-rpm:attoparsec
-
--- the semver package only exposes lens-style accessors for its Version type;
--- normal accessors are in an un-exposed Internal module. on master, the
--- Internal module is exposed, but a new release hasn't been cut to hackage yet
---
--- we can remove this if/when 0.4.0.2 is released on hackage
-source-repository-package
-  type: git
-  location: https://github.com/fossas/semver.git
-  tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
-
--- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
--- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
--- a new release was never cut to hackage
--- We can remove this if/when 0.7.3 is released on hackage
-source-repository-package
-  type: git
-  location: https://github.com/da-x/cpio-conduit
-  tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
-
--- Current implementation of yarn-lock throws runtime error, as described by patches:
--- (a) https://github.com/Profpatsch/yarn2nix/pull/73
--- (b) https://github.com/Profpatsch/yarn2nix/pull/72
--- TODO: Remove once, both PRs are merged.
-source-repository-package
-  type: git
-  location: https://github.com/fossas/yarn2nix
-  tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
-  subdir: yarn-lock
-
--- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
--- environment variable. Modified source code below, supports aforementioned environment variables.
-source-repository-package
-  type: git
-  location: https://github.com/fossas/hs-certificate
-  tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
-  subdir: x509-system
-
-source-repository-package
-  type: git
-  location: https://github.com/fossas/tar
-  tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
-
--- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
-source-repository-package
-  type: git
-  location: https://github.com/fossas/codec-rpm
-  tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
-
-index-state: hackage.haskell.org 2024-02-21T10:56:14Z
 
+import: ./cabal.project.common
+
 package *
   extra-include-dirs: /opt/homebrew/include
   extra-lib-dirs: /opt/homebrew/lib