Skip to content

Commit

Permalink
[fix] fix upstream hsec-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
MangoIV committed May 31, 2024
1 parent 51d1846 commit 84ddd18
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
7 changes: 7 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions nix/hsec-tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
directory,
extra,
feed,
fetchgit,
filepath,
hsec-core,
lib,
Expand All @@ -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 = [
Expand Down Expand Up @@ -74,6 +82,7 @@ mkDerivation {
hsec-core
optparse-applicative
text
transformers
validation-selective
];
testHaskellDepends = [
Expand Down

0 comments on commit 84ddd18

Please sign in to comment.