From 4ebc22781d41cd8d3d732da9c5c7090a0edfc3a4 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Thu, 19 Mar 2020 14:32:57 -0700 Subject: [PATCH] psc-package: Stop using haskellPackages to build Switch to the approach taken by https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix This downloads a prebuilt release and patches the linker paths. It reduces the number of supported platforms, but ensures we're using the official supported psc-package compiler. The `haskellPackages` approach wasn't supported and was leading to version conflicts with dependencies. --- .../purescript/psc-package/default.nix | 70 ++++++++++++++----- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 908a8e943e78..0bebd5d2f50d 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -1,27 +1,61 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: +# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix +{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }: -with lib; +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; + +in +stdenv.mkDerivation rec { + pname = "psc-package-simple"; -mkDerivation rec { - pname = "psc-package"; version = "0.6.2"; - src = fetchFromGitHub { - owner = "purescript"; - repo = pname; - rev = "v${version}"; - sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y"; + src = if stdenv.isDarwin + then fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; + sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; + } + else fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz"; + sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54"; }; - isLibrary = false; - isExecutable = true; + buildInputs = [ gmp zlib ]; + nativeBuildInputs = [ installShellFiles ]; - executableHaskellDepends = with haskellPackages; [ - aeson aeson-pretty either errors optparse-applicative - system-filepath turtle - ]; + libPath = lib.makeLibraryPath buildInputs; - description = "A package manager for PureScript based on package sets"; - license = licenses.bsd3; - maintainers = with lib.maintainers; [ Profpatsch ]; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + + PSC_PACKAGE=$out/bin/psc-package + + install -D -m555 -T psc-package $PSC_PACKAGE + chmod u+w $PSC_PACKAGE + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool \ + -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ + $PSC_PACKAGE + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE + '' + '' + chmod u-w $PSC_PACKAGE + + $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash + $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish + $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package + installShellCompletion \ + psc-package.{bash,fish} \ + --zsh _psc-package + ''; + + meta = with lib; { + description = "A package manager for PureScript based on package sets"; + license = licenses.bsd3; + maintainers = with maintainers; [ Profpatsch ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf5f169933ef..a69af3479204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,8 +8343,7 @@ in purescript = callPackage ../development/compilers/purescript/purescript { }; - psc-package = haskell.lib.justStaticExecutables - (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + psc-package = callPackage ../development/compilers/purescript/psc-package { }; purescript-psa = nodePackages.purescript-psa;