Unverified Commit c03f5f55 authored by Yorick van Pelt's avatar Yorick van Pelt
Browse files

jemalloc: don't try to patch 4.5.0

parent 2c5efc87

pkgs/development/libraries/jemalloc/common.nix

+3 −8
Original line number Diff line number Diff line 
{ stdenv, fetchurl, fetchpatch, version, sha256 }:

{ stdenv, fetchurl, version, sha256, ... }@args:



stdenv.mkDerivation rec {

stdenv.mkDerivation (rec {

  name = "jemalloc-${version}";

  inherit version;
@@ -19,11 +19,6 @@ stdenv.mkDerivation rec { 
                   ++ stdenv.lib.optional stdenv.isArm "--disable-thp";

  doCheck = true;



  patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {

    url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";

    sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";

  });



  enableParallelBuilding = true;



  meta = with stdenv.lib; {
@@ -37,4 +32,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.all;

    maintainers = with maintainers; [ wkennington ];

  };

}
 
} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))

pkgs/development/libraries/jemalloc/default.nix

+5 −1
Original line number Diff line number Diff line 
{ stdenv, fetchurl, fetchpatch }:

import ./common.nix {

  inherit stdenv fetchurl fetchpatch;

  inherit stdenv fetchurl;

  version = "5.0.1";

  sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9";

  patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {

    url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";

    sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";

  });

}

pkgs/development/libraries/jemalloc/jemalloc450.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchurl, fetchpatch }:

{ stdenv, fetchurl }:

import ./common.nix {

  inherit stdenv fetchurl fetchpatch;

  inherit stdenv fetchurl;

  version = "4.5.0";

  sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";

}