git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65021 from joachifm/graphene-hardened-malloc

graphene-hardened-malloc: 190405.003.2019.04.01.19 -> 1

commit75a3bf5e5d3d8449615e908e47c018d2d79a72a5 authorJoachim F <joachifm@users.noreply.github.com> dateFri 19 Jul 2019, 06:51 (7 years ago) parentfe26928948d2e3
1 file changed+6−4
pkgs/development/libraries/graphene-hardened-malloc/default.nix+6−4
pkgs/development/libraries/graphene-hardened-malloc/default.nix+6−4
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "graphene-hardened-malloc-${version}";
5− version = "190405.003.2019.04.01.19";
5+ version = "1";
66
77 src = fetchurl {
8− url = "https://github.com/GrapheneOS/hardened_malloc/archive/PQ2A.${version}.tar.gz";
9− sha256 = "1qczmajy3q07jd236dmal4iq5xxcsrkyw26gc9r4vs4wj4m42d11";
8+ url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz";
9+ sha256 = "1z3kb9fr6w9fcdc42bh8k5b4r10sn5hrwwk4m691qjdgk5hlj3aa";
1010 };
1111
1212 installPhase = ''
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717 chmod 0555 $out/bin/preload-hardened-malloc
1818 '';
1919
20+ separateDebugInfo = true;
21+
2022 doInstallCheck = true;
2123 installCheckPhase = ''
2224 pushd test
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
2729 make
2830
2931 # these tests don't actually appear to generate overflows currently
30− rm read_after_free_small string_overflow
32+ rm read_after_free_small string_overflow eight_byte_overflow_large
3133
3234 for t in `find . -regex ".*/[a-z_]+"` ; do
3335 echo "Running $t..."