From a99948c46a6afb533c43fe202f80d01fe78acad3 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 25 Sep 2023 09:40:58 +0200 Subject: vscode-extensions.davidanson.vscode-markdownlint: 0.51.0 -> 0.52.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d2..90c8344d935 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -896,8 +896,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.51.0"; - sha256 = "sha256-Xtr8cqcPrcrKpJBxQcY1j9Gl4CC6U3ZazS4bdBtdzUk="; + version = "0.52.0"; + sha256 = "sha256-Y8qkcNEvJ/yzT8PDeErRzKGxYBNKKfbNNsJVaFDeIV4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; -- cgit 1.4.1 From e026e949349d1ba66ee22f3330fb67ac36ba7046 Mon Sep 17 00:00:00 2001 From: Felix Schröter Date: Tue, 3 Oct 2023 01:20:38 +0200 Subject: vscode-extensions.firefox-devtools.vscode-firefox-debug: 2.9.8 -> 2.9.10 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d2..cf67ef71296 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1400,8 +1400,8 @@ let mktplcRef = { name = "vscode-firefox-debug"; publisher = "firefox-devtools"; - version = "2.9.8"; - sha256 = "sha256-MCL562FPgEfhUM1KH5LMl7BblbjIkQ4UEwB67RlO5Mk="; + version = "2.9.10"; + sha256 = "sha256-xuvlE8L/qjOn8Qhkv9sutn/xRbwC9V/IIfEr4Ixm1vA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; -- cgit 1.4.1 From 6c6a334f8f99211aff3d6c596a532a05aa7b4453 Mon Sep 17 00:00:00 2001 From: wackbyte Date: Thu, 28 Sep 2023 13:33:47 -0400 Subject: vscode-extensions.uiua-lang.uiua-vscode: init at 0.0.12 --- pkgs/applications/editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d2..31fb5946b69 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3507,6 +3507,22 @@ let }; }; + uiua-lang.uiua-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "uiua-vscode"; + publisher = "uiua-lang"; + version = "0.0.12"; + sha256 = "sha256-clVVRJihErAiZHcGImgFoxdD97o6S7NJm8BqfH41MFE="; + }; + meta = { + description = "VSCode language extension for Uiua"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; + homepage = "https://github.com/uiua-lang/uiua-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-mdx"; -- cgit 1.4.1 From 5ee4a4454f5472482d2f204101bf12a0141e366f Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:36:23 +0200 Subject: vscode-extensions.asvetliakov.vscode-neovim: 0.0.97 -> 0.8.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1f5d14282d2..8dfe3963028 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -343,11 +343,16 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.97"; - sha256 = "sha256-rNGW8WB3jBSjThiB0j4/ORKMRAaxFiMiBfaa+dbGu/w="; + version = "0.8.2"; + sha256 = "0kw9asv91s37ql61blbb8pr7wb6c2ba1klchal53chp6ib55v5kn"; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; + description = "Vim-mode for VS Code using embedded Neovim"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=asvetliakov.vscode-neovim"; license = lib.licenses.mit; + homepage = "https://github.com/vscode-neovim/vscode-neovim"; + maintainers = [ lib.maintainers.mikaelfangel ]; }; }; -- cgit 1.4.1 From 7b69d8e88527b633cfc1bb787a90dd7e12c39e64 Mon Sep 17 00:00:00 2001 From: Christina Sørensen Date: Wed, 4 Oct 2023 10:39:14 +0200 Subject: 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(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index 528723878ef..f5d3976232a 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 ]; -- cgit 1.4.1 From b2cb9c6fb9409537143e5813e9187ef45692e089 Mon Sep 17 00:00:00 2001 From: Christina Sørensen Date: Wed, 4 Oct 2023 11:36:46 +0200 Subject: 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 --- pkgs/applications/editors/imhex/default.nix | 90 ----------------------------- pkgs/by-name/im/imhex/package.nix | 90 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 90 insertions(+), 92 deletions(-) delete mode 100644 pkgs/applications/editors/imhex/default.nix create mode 100644 pkgs/by-name/im/imhex/package.nix (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix deleted file mode 100644 index f5d3976232a..00000000000 --- a/pkgs/applications/editors/imhex/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, stdenv -, cmake -, llvm -, fetchFromGitHub -, mbedtls -, gtk3 -, pkg-config -, capstone -, dbus -, libGLU -, glfw3 -, file -, perl -, python3 -, jansson -, curl -, fmt_8 -, nlohmann_json -, yara -, rsync -}: - -let - # 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${patterns_version}"; - hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM="; - }; - -in -stdenv.mkDerivation rec { - pname = "imhex"; - inherit version; - - src = fetchFromGitHub { - fetchSubmodules = true; - owner = "WerWolv"; - repo = pname; - rev = "a62ede784018f9d5aaf40587f71a1271429ab50b"; - hash = "sha256-lIk8oPEkkkkkkkkkkkkuh2hIx/Qg1kf9tTFvH3gX8XA="; - }; - - nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; - - buildInputs = [ - capstone - curl - dbus - file - fmt_8 - glfw3 - gtk3 - jansson - libGLU - mbedtls - nlohmann_json - yara - ]; - - cmakeFlags = [ - "-DIMHEX_OFFLINE_BUILD=ON" - "-DUSE_SYSTEM_CAPSTONE=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_FMT=ON" - "-DUSE_SYSTEM_LLVM=ON" - "-DUSE_SYSTEM_NLOHMANN_JSON=ON" - "-DUSE_SYSTEM_YARA=ON" - ]; - - # rsync is used here so we can not copy the _schema.json files - postInstall = '' - mkdir -p $out/share/imhex - rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,patterns} $out/share/imhex - ''; - - meta = with lib; { - 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 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix new file mode 100644 index 00000000000..8156992edd3 --- /dev/null +++ b/pkgs/by-name/im/imhex/package.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, cmake +, llvm +, fetchFromGitHub +, mbedtls +, gtk3 +, pkg-config +, capstone +, dbus +, libGLU +, glfw3 +, file +, perl +, python3 +, jansson +, curl +, fmt_8 +, nlohmann_json +, yara +, rsync +}: + +let + # 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${patterns_version}"; + hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM="; + }; + +in +stdenv.mkDerivation rec { + pname = "imhex"; + inherit version; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "WerWolv"; + repo = pname; + rev = "a62ede784018f9d5aaf40587f71a1271429ab50b"; + hash = "sha256-L3ncmM7Ro60DvOF/Y0fjo2Smlw2LL8cPa8H6yVGdGAk="; + }; + + nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; + + buildInputs = [ + capstone + curl + dbus + file + fmt_8 + glfw3 + gtk3 + jansson + libGLU + mbedtls + nlohmann_json + yara + ]; + + cmakeFlags = [ + "-DIMHEX_OFFLINE_BUILD=ON" + "-DUSE_SYSTEM_CAPSTONE=ON" + "-DUSE_SYSTEM_CURL=ON" + "-DUSE_SYSTEM_FMT=ON" + "-DUSE_SYSTEM_LLVM=ON" + "-DUSE_SYSTEM_NLOHMANN_JSON=ON" + "-DUSE_SYSTEM_YARA=ON" + ]; + + # rsync is used here so we can not copy the _schema.json files + postInstall = '' + mkdir -p $out/share/imhex + rsync -av --exclude="*_schema.json" ${patterns_src}/{constants,encodings,includes,magic,patterns} $out/share/imhex + ''; + + meta = with lib; { + 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 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9718a46468e..fa6637308c9 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 { }; -- cgit 1.4.1