diff --git a/cabal.project b/cabal.project index 9f8d001..11a8787 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,11 @@ packages: ./. +-- https://github.com/haskell/security-advisories/pull/201 +source-repository-package + type: git + subdir: code/hsec-tools + location: https://github.com/mangoiv/security-advisories.git + tag: 8e8b11e08d8026af91f4487391935dcdc8833c75 + test-show-details: direct diff --git a/flake.nix b/flake.nix index 99738ba..12a54c8 100644 --- a/flake.nix +++ b/flake.nix @@ -100,7 +100,11 @@ cabal2nix cabal://hsec-core > ./hsec-core.nix cabal2nix cabal://cvss > ./cvss.nix cabal2nix cabal://osv > ./osv.nix - cabal2nix cabal://hsec-tools > ./hsec-tools.nix + # https://github.com/haskell/security-advisories/pull/201 + # cabal2nix cabal://hsec-tools > ./hsec-tools.nix + cabal2nix https://github.com/haskell/security-advisories.git \ + --revision 8e8b11e08d8026af91f4487391935dcdc8833c75 \ + --subpath code/hsec-tools/ > ./hsec-tools.nix cabal2nix ../. > ./cabal-audit.nix alejandra ./. popd diff --git a/nix/hsec-tools.nix b/nix/hsec-tools.nix index 243b5ce..53ec3b0 100644 --- a/nix/hsec-tools.nix +++ b/nix/hsec-tools.nix @@ -12,6 +12,7 @@ directory, extra, feed, + fetchgit, filepath, hsec-core, lib, @@ -31,12 +32,19 @@ text, time, toml-parser, + transformers, validation-selective, }: mkDerivation { pname = "hsec-tools"; - version = "0.1.0.0"; - sha256 = "06c1b1278cbceda0059074a98c3fce2691ccecb25f8fcdcea97218c2d7f388e0"; + version = "0.2.0.0"; + src = fetchgit { + url = "https://github.com/haskell/security-advisories.git"; + sha256 = "0j7q8mmlgi5rw82h75rz3nfh6d36qw805hwwy9d5mmchdpsgpall"; + rev = "8e8b11e08d8026af91f4487391935dcdc8833c75"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/code/hsec-tools/; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74,6 +82,7 @@ mkDerivation { hsec-core optparse-applicative text + transformers validation-selective ]; testHaskellDepends = [