public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86458 from Mic92/radare2 

radare2: 4.3.1 -> 4.4.0
This commit is contained in:
Jörg Thalheim 2020-05-01 17:18:45 +01:00 committed by GitHub
parent 4a2f821870 5569860b1f
commit e4fadff0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/appimage/appimage-exec.sh
View File

@ -17,7 +17,7 @@ unpack() {
local appimageType=0 local appimageType=0
# https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | eval "$(r2 -nn -Nqc "p8j 3 @ 8" "$src"|
jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|
@sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')"
@ -38,7 +38,7 @@ unpack() {
# multiarch offset one-liner using same method as AppImage # multiarch offset one-liner using same method as AppImage
# see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ offset=$(r2 -nn -Nqc "pfj.elf_header @ 0" "$src"|\
jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset."

14
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -110,17 +110,17 @@ in {
#<generated> #<generated>
# DO NOT EDIT! Automatically generated by ./update.py # DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic { radare2 = generic {
version_commit = "24088"; version_commit = "24545";
gittap = "4.3.1"; gittap = "4.4.0";
gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a";
rev = "4.3.1"; rev = "4.4.0";
version = "4.3.1"; version = "4.4.0";
sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s";
cs_ver = "4.0.1"; cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
}; };
r2-for-cutter = generic { r2-for-cutter = generic {
version_commit = "24088"; version_commit = "24545";
gittap = "4.3.1"; gittap = "4.3.1";
gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";

9
pkgs/development/tools/unityhub/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
appimageTools.wrapType2 rec { let
version = "2.3.1";
in appimageTools.wrapType2 rec {
name = "unityhub"; name = "unityhub";
extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr
@ -16,8 +18,9 @@ appimageTools.wrapType2 rec {
''; '';
src = fetchurl { src = fetchurl {
url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage
sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage";
sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {