diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-24 00:05:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-24 00:05:04 +0000 |
commit | 05b69d83daafb043d8fd193b61af3f9290174146 (patch) | |
tree | 1bb9eae93686cd1d255b8cc1001329827e79824e /pkgs/development/tools | |
parent | 38fe12189506453de8e548b7149b7f0e317c9863 (diff) | |
parent | ab0caff134dbe8b5123feead5297708e6e3144b4 (diff) | |
download | nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.gz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.bz2 nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.lz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.xz nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.tar.zst nixpkgs-05b69d83daafb043d8fd193b61af3f9290174146.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/analysis/tfsec/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/buildah/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/comby/default.nix | 77 | ||||
-rw-r--r-- | pkgs/development/tools/efm-langserver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/fdroidserver/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/rgp/default.nix | 15 |
6 files changed, 89 insertions, 20 deletions
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7800f4c1eda..62c05439644 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.50.7"; + version = "0.51.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0rklv9wj8gf95ar345k3ghpg9hxjpbsi693239wdfarzbsjrlcla"; + sha256 = "18qblimn78w17gydy7h9sjl9ri1wkvzi5phsqz1dkk43i3ryjg3s"; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 13ae74db977..c92b229f05a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.3"; + version = "1.21.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8="; + sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA="; }; outputs = [ "out" "man" ]; 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/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 2984de4c5e1..48d4059277d 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.32"; + version = "0.0.36"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc="; + sha256 = "sha256-X2z49KmJiKh1QtcDBZcqNiMhq5deVamS47w6gyVq7Oo="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index af851e25211..6b3690de91b 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -16,7 +16,6 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" - substituteInPlace setup.py --replace "pyasn1-modules >= 0.2.1, < 0.3" "pyasn1-modules" ''; preConfigure = '' @@ -33,8 +32,6 @@ python.pkgs.buildPythonApplication rec { androguard clint defusedxml - docker - docker-py GitPython libcloud mwclient @@ -59,7 +56,7 @@ python.pkgs.buildPythonApplication rec { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; - maintainers = [ lib.maintainers.pmiddend ]; + maintainers = [ lib.maintainers.obfusk ]; }; } 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 = '' |