Update purs (0.15.16-7, 0.15.16-8) and purs-tidy (0.11.1) (#122)

* Skip patching for statically linked purs versions >= 0.15.16-7

Author: robo-trh

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -6,3 +6,4 @@ node_modules
 .psc*
 
 TODO.md
+.direnv

manifests/build-support/mkPursDerivation.nix

@@ -5,44 +5,55 @@
   gmp,
   fetchurl,
   ncurses5,
-}: {
+}:
+{
   version,
   url,
   hash,
-}: let
+}:
+let
   dynamic-linker = stdenv.cc.bintools.dynamicLinker;
 
-  patchelf = libPath:
-    if stdenv.isDarwin
-    then ""
-    else ''
-      chmod u+w $PURS
-      patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS
-      chmod u-w $PURS
-    '';
+  # Versions >= 0.15.16-7 are statically linked and don't need patching
+  needsPatching = lib.versionOlder version "0.15.16-7";
+
+  patchelf =
+    libPath:
+    if stdenv.isDarwin || !needsPatching then
+      ""
+    else
+      ''
+        chmod u+w $PURS
+        patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS
+        chmod u-w $PURS
+      '';
 in
-  stdenv.mkDerivation rec {
-    pname = "purs";
-    inherit version;
+stdenv.mkDerivation rec {
+  pname = "purs";
+  inherit version;
 
-    src = fetchurl {inherit url hash;};
+  src = fetchurl { inherit url hash; };
 
-    buildInputs = [zlib gmp ncurses5];
-    libPath = lib.makeLibraryPath buildInputs;
-    dontStrip = true;
+  buildInputs = lib.optionals needsPatching [
+    zlib
+    gmp
+    ncurses5
+  ];
+  libPath = lib.makeLibraryPath buildInputs;
+  dontStrip = true;
 
-    installPhase = ''
-      mkdir -p $out/bin
-      PURS="$out/bin/purs"
-      install -D -m555 -T purs $PURS
-      ${patchelf libPath}
-      mkdir -p $out/etc/bash_completion.d/
-      $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    PURS="$out/bin/purs"
+    install -D -m555 -T purs $PURS
+    ${patchelf libPath}
+    mkdir -p $out/etc/bash_completion.d/
+    $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash
+  '';
 
-    meta = with lib; {
-      description = "Compiler for a strongly-typed language that compiles to JavaScript";
-      homepage = "https://github.com/purescript/purescript";
-      mainProgram = pname;
-    };
-  }
+  meta = {
+    description = "Compiler for a strongly-typed language that compiles to JavaScript";
+    homepage = "https://github.com/purescript/purescript";
+    mainProgram = pname;
+  };
+}

manifests/named.json

@@ -1,12 +1,12 @@
 {
-  "purs-stable": "purs-0_15_15",
-  "purs-unstable": "purs-0_15_16-6",
-  "spago-stable": "spago-0_21_0",
-  "spago-unstable": "spago-0_93_44",
-  "purs-tidy-stable": "purs-tidy-0_11_0",
-  "purs-tidy-unstable": "purs-tidy-0_11_0",
-  "purs-backend-es-stable": "purs-backend-es-1_4_3",
-  "purs-backend-es-unstable": "purs-backend-es-1_4_3",
-  "purescript-language-server-stable": "purescript-language-server-0_18_5",
-  "purescript-language-server-unstable": "purescript-language-server-0_18_5"
+    "purs-stable": "purs-0_15_15",
+    "purs-unstable": "purs-0_15_16-8",
+    "spago-stable": "spago-0_21_0",
+    "spago-unstable": "spago-0_93_44",
+    "purs-tidy-stable": "purs-tidy-0_11_1",
+    "purs-tidy-unstable": "purs-tidy-0_11_1",
+    "purs-backend-es-stable": "purs-backend-es-1_4_3",
+    "purs-backend-es-unstable": "purs-backend-es-1_4_3",
+    "purescript-language-server-stable": "purescript-language-server-0_18_5",
+    "purescript-language-server-unstable": "purescript-language-server-0_18_5"
 }

manifests/purs-tidy.json

@@ -82,5 +82,9 @@
   "0.11.0": {
     "hash": "sha256-wJ7OG2ApRr8Zp6aVjRwSCH/yat2qx2JzozbfU4F5DYU=",
     "url": "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.11.0.tgz"
+  },
+  "0.11.1": {
+    "hash": "sha256-+bX+NntwZw7YYgO1kkSGSLnpXb8imgPB2QCjRH6hsoE=",
+    "url": "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.11.1.tgz"
   }
 }