diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 00:02:12 +0000 |
| commit | ea64a128d1ed70c40ce897d0d8cc569e2eb394cd (patch) | |
| tree | 7c100fb9a45eeffc2013e0edac4287f3533f3110 /pkgs/development/tools | |
| parent | 38910351b753e23a1731fd95fa99765d3a21dcc5 (diff) | |
| parent | 1073633d8914364109bf453af7bed0aa06e5f5bf (diff) | |
| download | nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.gz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.bz2 nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.lz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.xz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.zst nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index a08aaac832e..39f6d5f7aa2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -6,6 +6,8 @@ buildDunePackage rec { version = "3.2.1"; pname = "js_of_ocaml-camlp4"; + useDune2 = false; + src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 31eafb1086b..ac00e341878 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config cpio ]; - buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; + nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; + buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; }; |