From 7b69d8e88527b633cfc1bb787a90dd7e12c39e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 4 Oct 2023 10:39:14 +0200 Subject: [PATCH 1/3] imhex: 1.30.1 -> unstable-2023-10-01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/applications/editors/imhex/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index 528723878efd..f5d3976232a8 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/applications/editors/imhex/default.nix @@ -22,12 +22,15 @@ }: let - version = "1.30.1"; + # FIXME: unstable, stable needs #252945 (details in #258964) + # Next version bump should be stabilized + version = "unstable-2023-10-01"; + patterns_version = "1.31.0"; patterns_src = fetchFromGitHub { owner = "WerWolv"; repo = "ImHex-Patterns"; - rev = "ImHex-v${version}"; + rev = "ImHex-v${patterns_version}"; hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM="; }; @@ -40,8 +43,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; owner = "WerWolv"; repo = pname; - rev = "v${version}"; - hash = "sha256-3s9Dgdhl+k2KjMoSHNl59YOoCEwqK+37DOzKdGP88/4="; + rev = "a62ede784018f9d5aaf40587f71a1271429ab50b"; + hash = "sha256-lIk8oPEkkkkkkkkkkkkuh2hIx/Qg1kf9tTFvH3gX8XA="; }; nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; From b2cb9c6fb9409537143e5813e9187ef45692e089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 4 Oct 2023 11:36:46 +0200 Subject: [PATCH 2/3] imhex: move to `pkgs/by-name` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- .../editors/imhex/default.nix => by-name/im/imhex/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/editors/imhex/default.nix => by-name/im/imhex/package.nix} (96%) diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/by-name/im/imhex/package.nix similarity index 96% rename from pkgs/applications/editors/imhex/default.nix rename to pkgs/by-name/im/imhex/package.nix index f5d3976232a8..8156992edd3d 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { owner = "WerWolv"; repo = pname; rev = "a62ede784018f9d5aaf40587f71a1271429ab50b"; - hash = "sha256-lIk8oPEkkkkkkkkkkkkuh2hIx/Qg1kf9tTFvH3gX8XA="; + hash = "sha256-L3ncmM7Ro60DvOF/Y0fjo2Smlw2LL8cPa8H6yVGdGAk="; }; nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9718a46468eb..fa6637308c9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33064,8 +33064,6 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; - imhex = callPackage ../applications/editors/imhex { }; - inframap = callPackage ../applications/networking/cluster/inframap { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; From 0d917d162111ac58ba43fe882cc1370a3e1eee65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 4 Oct 2023 11:37:39 +0200 Subject: [PATCH 3/3] imhex: add cafkafk to maintainers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/im/imhex/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 8156992edd3d..2f1a6b927df2 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; homepage = "https://github.com/WerWolv/ImHex"; license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ luis kashw2 ]; + maintainers = with maintainers; [ luis kashw2 cafkafk ]; platforms = platforms.linux; }; }