summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-08 12:34:13 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-08 12:35:35 +0200
commit1088e55baf0631c604d2f873f295b2435c8f7de1 (patch)
tree59b0a8709ce5a72eef844ae3aeceaeac5d1a88fc /pkgs/development/haskell-modules
parent30632123fb19cf252a6ecc0377f101b22b76be37 (diff)
downloadnixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar.gz
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar.bz2
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar.lz
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar.xz
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.tar.zst
nixpkgs-1088e55baf0631c604d2f873f295b2435c8f7de1.zip
haskellPackages.cabal2nix-unstable: 2021-06-12 -> 2021-07-08
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/cabal2nix-unstable.nix6
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix7
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index 8b058b2dc05..6a769a47ef8 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2021-06-12";
+  version = "unstable-2021-07-08";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz";
-    sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9";
+    url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz";
+    sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 364581829a7..fc856f0fa71 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -164540,8 +164540,8 @@ self: {
     ({ mkDerivation, ansi-terminal, array, ascii-progress, async
      , attoparsec, base, binary, boxes, cereal, cmdargs, containers
      , deepseq, directory, fgl, filepath, git, hashable, intern, mtl
-     , nettools, ocaml, parallel, parsec, pretty, process, stm, syb
-     , tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format
+     , nettools, parallel, parsec, pretty, process, stm, syb, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format
      , transformers, unordered-containers, z3
      }:
      mkDerivation {
@@ -164558,7 +164558,6 @@ self: {
          text-format transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       executableSystemDepends = [ ocaml ];
        testHaskellDepends = [
          base containers directory filepath mtl process stm tasty
          tasty-ant-xml tasty-hunit tasty-rerun transformers
@@ -164568,7 +164567,7 @@ self: {
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = lib.licenses.bsd3;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
-         inherit (pkgs) ocaml; inherit (pkgs) z3;};
+         inherit (pkgs) z3;};
 
   "liquid-ghc-prim" = callPackage
     ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: