diff options
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/comby/default.nix | 77 | ||||
-rw-r--r-- | pkgs/development/tools/rgp/default.nix | 15 |
2 files changed, 82 insertions, 10 deletions
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix new file mode 100644 index 00000000000..ca0a2413304 --- /dev/null +++ b/pkgs/development/tools/comby/default.nix @@ -0,0 +1,77 @@ +{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev +, autoconf, sqlite, stdenv }: +let + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: + ocamlPackages.buildDunePackage rec { + inherit pname; + version = "1.5.1"; + useDune2 = true; + minimumOcamlVersion = "4.08.1"; + doCheck = true; + + src = fetchFromGitHub { + owner = "comby-tools"; + repo = "comby"; + rev = version; + sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; + }; + + nativeBuildInputs = [ + ocamlPackages.ppx_deriving + ocamlPackages.ppx_deriving_yojson + ocamlPackages.ppx_sexp_conv + ocamlPackages.ppx_sexp_message + ] ++ extraNativeInputs; + + buildInputs = [ + ocamlPackages.core + ocamlPackages.ocaml_pcre + ocamlPackages.mparser + ocamlPackages.mparser-pcre + ocamlPackages.angstrom + ] ++ extraBuildInputs; + + checkInputs = [ cacert ]; + + meta = { + description = "Tool for searching and changing code structure"; + license = lib.licenses.asl20; + homepage = "https://comby.dev"; + }; + }; + + combyKernel = mkCombyPackage { pname = "comby-kernel"; }; +in mkCombyPackage { + pname = "comby"; + + extraBuildInputs = [ + zlib + gmp + libev + sqlite + ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet` + ocamlPackages.lwt + ocamlPackages.patience_diff + ocamlPackages.toml + ocamlPackages.cohttp-lwt-unix + ocamlPackages.opium + ocamlPackages.textutils + ocamlPackages.jst-config + ocamlPackages.parany + ocamlPackages.conduit-lwt-unix + ocamlPackages.lwt_react + ocamlPackages.tls + combyKernel + ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then + [ ocamlPackages.hack_parallel ] + else + [ ]); + + extraNativeInputs = [ + autoconf + pkg-config + ocamlPackages.ppx_jane + ocamlPackages.ppx_expect + ocamlPackages.dune-configurator + ]; +} diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 7b49a83b1cc..7b8ac88de63 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -12,22 +12,22 @@ , libX11 , libxcb , libXi -, ncurses5 +, ncurses , qtbase , qtdeclarative , zlib }: let - buildNum = "2021-03-31-696"; + buildNum = "2021-06-30-819"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - sha256 = "1GUV75KpYbeq7KkE86QqTfGnf/t3VEgviaAsbg/LWJI="; + sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -42,17 +42,12 @@ stdenv.mkDerivation rec { libX11 libxcb libXi - ncurses5 + ncurses qtbase qtdeclarative zlib ]; - runtimeDependencies = [ - "${placeholder "out"}/opt/rgp" - "${placeholder "out"}/opt/rgp/qt" - ]; - dontWrapQtApps = true; installPhase = '' |