about summary refs log tree commit diff
path: root/third_party/overlays
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-01-02T15·58+0100
committerclbot <clbot@tvl.fyi>2023-01-03T13·16+0000
commit7b88e4fa9b58b7c395433ed831e4f072e1b0c6d2 (patch)
tree64cd19cf0e733c7953250ef543644333064fb8fb /third_party/overlays
parent18481db54d4830f01cf42a0a2b1f0e13116b4ef8 (diff)
chore(3p/sources): Bump channels & overlays r/5574
* //3p/overlays/haskell: upstream has the correct version of graphmod
  now, but the updated meta set is not yet in the channel.

Change-Id: I55f23c6145d71346ced77d3c349e712f29752b9d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7730
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/overlays')
-rw-r--r--third_party/overlays/haskell/default.nix6
-rw-r--r--third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix33
2 files changed, 3 insertions, 36 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index c08932c74def..d80f377db866 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -30,9 +30,9 @@ in
       dhall = dhall-source "dhall" hsSuper.dhall;
       dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
 
-      # Use recently-released version that has 9.2 support
-      graphmod = assert hsSuper.graphmod != "1.4.5.1";
-        hsSelf.callPackage ./extra-pkgs/graphmod-1.4.5.1.nix { };
+      # Wait for upstream to remove the broken flag
+      graphmod = assert hsSuper.graphmod.meta.broken;
+        haskellLib.markUnbroken hsSuper.graphmod;
     };
   };
 
diff --git a/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix b/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix
deleted file mode 100644
index d11e739cdd4b..000000000000
--- a/third_party/overlays/haskell/extra-pkgs/graphmod-1.4.5.1.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation
-, base
-, Cabal
-, containers
-, directory
-, dotgen
-, filepath
-, haskell-lexer
-, lib
-, pretty
-}:
-mkDerivation {
-  pname = "graphmod";
-  version = "1.4.5.1";
-  sha256 = "d72b70dd47ba85756e963681307d8dcf341e9d1f0c3b50bd34c33a4e429436cc";
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base
-    Cabal
-    containers
-    directory
-    dotgen
-    filepath
-    haskell-lexer
-    pretty
-  ];
-  executableHaskellDepends = [ base ];
-  homepage = "http://github.com/yav/graphmod/wiki";
-  description = "Present the module dependencies of a program as a \"dot\" graph";
-  license = lib.licenses.bsd3;
-  mainProgram = "graphmod";
-}