Merge pull request #61 from MangoIV/mangoiv/fix-nix

[chore] fix CI

flake.nix

@@ -47,7 +47,9 @@
           };
         };
 
-        devShells.plain-haskell = import ./nix/haskell-shell.nix {inherit hspkgs;};
+        devShells.plain-haskell = hspkgs.callPackage ./nix/haskell-shell.nix {
+          inherit (pkgs.haskell.packages.ghc98) haskell-language-server fourmolu;
+        };
 
         # https://flake.parts/options/devshell for more information; one of the advantages is
         # the beautiful menu this provides where one can add commands that are offered and loaded
@@ -83,7 +85,7 @@
             name = "regen-cabal-audit-nix";
             runtimeInputs = [pkgs.cabal2nix pkgs.alejandra];
             text = let
-              v = "add617d5026bd31cad2bdbe8259b5f67381db246";
+              v = "ef73a3748f31d8df1557546b26d2d587cdacf459";
               cmd = pkg: ''
                 cabal2nix https://github.com/haskell/security-advisories.git \
                   --revision ${v} \

nix/cvss.nix

@@ -12,8 +12,8 @@ mkDerivation {
   version = "0.2";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "0a78ra4b6mwgzh0apvczdw9nzphkis9xqa0siicfhfb59vj60lp2";
-    rev = "add617d5026bd31cad2bdbe8259b5f67381db246";
+    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
+    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/cvss/; echo source root reset to $sourceRoot";

nix/haskell-overlay.nix

@@ -10,12 +10,9 @@
 
   extensions = hprev.extensions_0_1_0_2.override {inherit (hfinal) Cabal;};
 
-  ormolu = hlib.doJailbreak (hprev.ormolu.override {inherit (hfinal) Cabal-syntax;});
-  fourmolu = hlib.doJailbreak (hprev.fourmolu.override {inherit (hfinal) Cabal-syntax;});
+  toml-parser = hfinal.callHackage "toml-parser" "2.0.1.0" {};
 
-  toml-parser = hprev.toml-parser_2_0_1_0;
-  sel = hlib.doJailbreak (hlib.markUnbroken hprev.sel);
-  typst = hprev.typst_0_5_0_5;
-  typst-symbols = hprev.typst-symbols_0_1_6;
-  texmath = hprev.texmath_0_12_8_9;
+  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" {};
 }

nix/haskell-shell.nix

@@ -1,5 +1,10 @@
-{hspkgs, ...}:
-hspkgs.shellFor {
+{
+  shellFor,
+  haskell-language-server,
+  fourmolu,
+  ...
+}:
+shellFor {
   packages = hps: [hps.cabal-audit];
-  nativeBuildInputs = [hspkgs.haskell-language-server hspkgs.fourmolu];
+  nativeBuildInputs = [haskell-language-server fourmolu];
 }

nix/hsec-core.nix

@@ -18,8 +18,8 @@ mkDerivation {
   version = "0.2.0.1";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "0a78ra4b6mwgzh0apvczdw9nzphkis9xqa0siicfhfb59vj60lp2";
-    rev = "add617d5026bd31cad2bdbe8259b5f67381db246";
+    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
+    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/hsec-core/; echo source root reset to $sourceRoot";

nix/hsec-tools.nix

@@ -48,8 +48,8 @@ mkDerivation {
   version = "0.2.0.1";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "0a78ra4b6mwgzh0apvczdw9nzphkis9xqa0siicfhfb59vj60lp2";
-    rev = "add617d5026bd31cad2bdbe8259b5f67381db246";
+    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
+    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/hsec-tools/; echo source root reset to $sourceRoot";

nix/osv.nix

@@ -12,11 +12,11 @@
 }:
 mkDerivation {
   pname = "osv";
-  version = "0.1.0.1";
+  version = "0.1.0.2";
   src = fetchgit {
     url = "https://github.com/haskell/security-advisories.git";
-    sha256 = "0a78ra4b6mwgzh0apvczdw9nzphkis9xqa0siicfhfb59vj60lp2";
-    rev = "add617d5026bd31cad2bdbe8259b5f67381db246";
+    sha256 = "1x4zsw56hj13j2pc75vfdkw645r061a9h4rv26c6361j7wrpyr67";
+    rev = "ef73a3748f31d8df1557546b26d2d587cdacf459";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/code/osv/; echo source root reset to $sourceRoot";