Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 407b8d2b8f92
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7342871ea0d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 26, 2017

  1. jmeter: 2.11 -> 3.3 and fix java command not found

    Alexandre Peyroux committed Dec 26, 2017
    Copy the full SHA
    0ccf8bf View commit details

Commits on Jan 6, 2018

  1. Merge pull request #33081 from apeyroux/up-jmeter 

    jmeter: 2.11 -> 3.3 and fix java command not found
    @joachifm
    joachifm authored Jan 6, 2018
    Copy the full SHA
    7342871 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/applications/networking/jmeter/default.nix
10 changes: 7 additions & 3 deletions pkgs/applications/networking/jmeter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{ fetchurl, stdenv, ant }:
{ fetchurl, stdenv, jre }:

stdenv.mkDerivation rec {
name = "jmeter-2.11";
name = "jmeter-3.3";
src = fetchurl {
url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz";
sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944";
sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5";
};

buildInputs = [ jre ];

installPhase = ''
substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS"
substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS"
mkdir $out
cp ./* $out/ -R
'';