diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-22 23:55:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 23:55:21 +0200 |
| commit | b607aadaac36e77ff58303d199ae4f77227e41f3 (patch) | |
| tree | 0ce5a76872bea27ed4a91b272b9972e97c5a2954 /pkgs/applications/version-management | |
| parent | 32e718341035ef748812b641d6f3e75e216b5d7f (diff) | |
| parent | 465e5fc8cd73eca36e6bc4a320fdac8bd50bb160 (diff) | |
| download | nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar.gz nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar.bz2 nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar.lz nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar.xz nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.tar.zst nixpkgs-b607aadaac36e77ff58303d199ae4f77227e41f3.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/gitolite/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 8dd2766ff0e..e9712a859d7 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : ${lib.makeBinPath [ git perl ]} + --prefix PATH : ${lib.makeBinPath [ git (perl.withPackages (p: [ p.JSON ])) ]} ''; installPhase = '' |