diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/development/libraries/graphene-hardened-malloc | |
parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
download | nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.zip |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/development/libraries/graphene-hardened-malloc')
-rw-r--r-- | pkgs/development/libraries/graphene-hardened-malloc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index dc3defac638..66c5d8eb061 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graphene-hardened-malloc"; - version = "1"; + version = "2"; src = fetchurl { url = "https://github.com/GrapheneOS/hardened_malloc/archive/${version}.tar.gz"; - sha256 = "1z3kb9fr6w9fcdc42bh8k5b4r10sn5hrwwk4m691qjdgk5hlj3aa"; + sha256 = "0zsl4vl65ic6lw5rzcjzvcxg8makg683abnwvy60zfap8hvijvjb"; }; installPhase = '' |