bigloo: 4.1a-2 → 4.3h; hop: 2.5.1 → 3.3.0

pkgs/development/compilers/hop/default.nix

@@ -1,10 +1,16 @@
 { stdenv, fetchurl, bigloo }:
 
+# Compute the “release” version of bigloo (before the first dash, if any)
+let bigloo-release =
+  let inherit (stdenv.lib) head splitString; in
+  head (splitString "-" (builtins.parseDrvName bigloo.name).version)
+; in
+
 stdenv.mkDerivation rec {
-  name = "hop-2.5.1";
+  name = "hop-3.3.0";
   src = fetchurl {
     url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz";
-    sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys";
+    sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5";
   };
 
   postPatch = ''
@@ -13,13 +19,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bigloo ];
 
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a";
-  '';
-
   configureFlags = [
     "--bigloo=${bigloo}/bin/bigloo"
-    "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/"
+    "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
   ];
 
   meta = with stdenv.lib; {