From 4fca420a18fcf92e302736278940d44b65665320 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Jul 2019 12:00:17 -0500 Subject: boomerang: 0.4.0-alpha-2018-10-25 -> 0.5.0 https://github.com/BoomerangDecompiler/boomerang/releases/tag/v0.5.0 --- pkgs/development/tools/boomerang/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 2623787993c6..d16ec035e9c9 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase }: +{ stdenv, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }: stdenv.mkDerivation rec { pname = "boomerang"; - version = "0.4.0-alpha-2018-07-03"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "ceeac"; - repo = "boomerang"; - rev = "377ff2d7db93d892c925e2d3e61aef818371ce7d"; - sha256 = "1ljbyj3b8xckr1wihyii3h576zgq0q88vli0ylpr3p4jxy5sm57j"; + owner = "BoomerangDecompiler"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "1q8qg506c39fidihqs8rbmqlr7bgkayyp5sscszgahs34cyvqic7"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake bison flex ]; + buildInputs = [ qtbase capstone ]; postPatch = # Look in installation directory for required files, not relative to working directory -- cgit 1.4.1 From 32d132a8eed3764bdc3de2873f977b09e5b5d0f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Jul 2019 12:13:34 -0500 Subject: boomerang: remove deprecated fixups/workarounds If they're still needed they should be reworked so they apply :) --- pkgs/development/tools/boomerang/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index d16ec035e9c9..6947d69f2101 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -14,24 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; buildInputs = [ qtbase capstone ]; - postPatch = - # Look in installation directory for required files, not relative to working directory - '' - substituteInPlace src/boomerang/core/Settings.cpp \ - --replace "setDataDirectory(\"../share/boomerang\");" \ - "setDataDirectory(\"$out/share/boomerang\");" \ - --replace "setPluginDirectory(\"../lib/boomerang/plugins\");" \ - "setPluginDirectory(\"$out/lib/boomerang/plugins\");" - '' - # Fixup version: - # * don't try to inspect with git - # (even if we kept .git and such it would be "dirty" because of patching) - # * use date so version is monotonically increasing moving forward - + '' - sed -i cmake-scripts/boomerang-version.cmake \ - -e 's/set(\(PROJECT\|BOOMERANG\)_VERSION ".*")/set(\1_VERSION "${version}")/' - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { -- cgit 1.4.1 From 6c275a5d5cc3f3a00ce4a0489269473fd258c456 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 11 Oct 2019 07:29:19 -0500 Subject: boomerang: 0.5.0 -> 0.5.1 --- pkgs/development/tools/boomerang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 6947d69f2101..07016b331401 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "boomerang"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "BoomerangDecompiler"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1q8qg506c39fidihqs8rbmqlr7bgkayyp5sscszgahs34cyvqic7"; + sha256 = "046ba4km8c31kbnllx05nbqhjmk7bpi56d3n8md8bsr98nj21a2j"; }; nativeBuildInputs = [ cmake bison flex ]; -- cgit 1.4.1 From 225053845b15612828384fce65172ddae195d94b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 11 Oct 2019 07:29:54 -0500 Subject: boomerang: use qt's mkDerivation --- pkgs/development/tools/boomerang/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 07016b331401..3a6b215e61fa 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, capstone, bison, flex }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "boomerang"; version = "0.5.1"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = http://boomerang.sourceforge.net/; + meta = with lib; { + homepage = https://github.com/BoomerangDecompiler/boomerang; license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; maintainers = with maintainers; [ dtzWill ]; -- cgit 1.4.1 From 472832f19c1b1e1ee4a85cda0aec333a7334b714 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 24 Oct 2019 01:03:20 -0500 Subject: boomerang: be less verbose/explicit, save for problematic upstream Co-Authored-By: Jon --- pkgs/development/tools/boomerang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 3a6b215e61fa..9e567ef59b0d 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "BoomerangDecompiler"; repo = pname; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "046ba4km8c31kbnllx05nbqhjmk7bpi56d3n8md8bsr98nj21a2j"; }; -- cgit 1.4.1