diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/libraries/libdwarf | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdwarf')
3 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix b/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix index 01ab2d720bf0..25d14de99ae2 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix @@ -2,7 +2,7 @@ callPackage ./common.nix rec { version = "20210528"; url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; - sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870"; + hash = "sha512-4PnIhVQFPubBsTM5YIkRieeCDEpN3DArfmN1Skzc/CrLG0tgg6ci0SBKdemU//NAHswlG4w7JAkPjLQEbZD4cA=="; buildInputs = [ zlib libelf ]; knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ]; } diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/common.nix b/nixpkgs/pkgs/development/libraries/libdwarf/common.nix index 32dc6eaa6e4e..ebf59ccd03f9 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/common.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/common.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url, knownVulnerabilities }: +{ lib, stdenv, fetchurl, buildInputs, hash, version, libelf, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; inherit version; src = fetchurl { - inherit url sha512; + inherit url hash; }; configureFlags = [ "--enable-shared" "--disable-nonshared" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 2beb4efc4bcd..0f96083100c2 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -2,7 +2,7 @@ callPackage ./common.nix rec { version = "0.4.2"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2"; + hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg=="; buildInputs = [ zlib ]; knownVulnerabilities = []; } |