6 files changed, 142 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/by-name/tr/tradingview/package.nix b/nixpkgs/pkgs/by-name/tr/tradingview/package.nix
index 9c0086dfffcb..0eb1240766a5 100644
--- a/nixpkgs/pkgs/by-name/tr/tradingview/package.nix
+++ b/nixpkgs/pkgs/by-name/tr/tradingview/package.nix
@@ -20,13 +20,14 @@
 , xorg
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tradingview";
-  version = "2.6.1";
-  revision = "44";
+  version = "2.6.3";
+  revision = "46";
+
   src = fetchurl {
-    url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${revision}.snap";
-    hash = "sha512-Hd00TWjPskd0QDzpOSwQCuMw20nW4n1xxRkT1rA95pzbXtw7XFxrJdMWkzWDbucuokU2qR2b5tovAHAgw9E0tQ==";
+    url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
+    hash = "sha512-jg3VPSfyjh+sYbrLDkqqy1tdUaxuEanQWW1U2SHUQ555tvn9X34pP8uarCFWqu9oye/7KF6KDEjjoIqirUKafw==";
   };
 
   nativeBuildInputs = [
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
     cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png
 
     mkdir $out/bin
-    makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath buildInputs }
+    makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath finalAttrs.buildInputs }
 
     runHook postInstall
   '';
@@ -90,4 +91,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     mainProgram = "tradingview";
   };
-}
+})
diff --git a/nixpkgs/pkgs/by-name/tr/tradingview/update.sh b/nixpkgs/pkgs/by-name/tr/tradingview/update.sh
index 863521bfde92..c3f38cbb4206 100644
--- a/nixpkgs/pkgs/by-name/tr/tradingview/update.sh
+++ b/nixpkgs/pkgs/by-name/tr/tradingview/update.sh
@@ -26,7 +26,7 @@ echo "Latest release is $upstream_version from $last_updated."
 #
 
 nixpkgs="$(git rev-parse --show-toplevel)"
-tradingview_nix="$nixpkgs/pkgs/applications/finance/tradingview/default.nix"
+tradingview_nix="$nixpkgs/pkgs/by-name/tr/tradingview/package.nix"
 current_nix_version=$(
   grep 'version\s*=' "$tradingview_nix" \
   | sed -Ene 's/.*"(.*)".*/\1/p'
@@ -44,10 +44,10 @@ fi
 #
 
 echo "Updating from ${current_nix_version} to ${upstream_version}, released ${last_updated}"
-
+echo 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${sri}"'";/'
 sed --regexp-extended \
   -e 's/revision\s*=\s*"[0-9]+"\s*;/revision = "'"${revision}"'";/' \
-  -e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${sri}"'";/' \
+  -e 's#hash\s*=\s*"[^"]*"\s*;#hash = "'"${sri}"'";#' \
   -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \
   -i "$tradingview_nix"
 
diff --git a/nixpkgs/pkgs/by-name/tr/tridactyl-native/lock.json b/nixpkgs/pkgs/by-name/tr/tridactyl-native/lock.json
new file mode 100644
index 000000000000..ca4a960bee71
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/tr/tridactyl-native/lock.json
@@ -0,0 +1,16 @@
+{
+  "depends": [
+    {
+      "method": "fetchzip",
+      "packages": [
+        "tempfile"
+      ],
+      "path": "/nix/store/d0x874ngf02b8fk1xralnvmij7xh0kjc-source",
+      "ref": "0.1.7",
+      "rev": "26e0239441755e5edcfd170e9aa566bb9c9eb6f3",
+      "sha256": "10d1g09q6p554pwr6a3b6ajnwqbphz3a4cwkfa05jbviflfyzjyk",
+      "srcDir": "",
+      "url": "https://github.com/OpenSystemsLab/tempfile.nim/archive/26e0239441755e5edcfd170e9aa566bb9c9eb6f3.tar.gz"
+    }
+  ]
+}
diff --git a/nixpkgs/pkgs/by-name/tr/tridactyl-native/package.nix b/nixpkgs/pkgs/by-name/tr/tridactyl-native/package.nix
new file mode 100644
index 000000000000..af5cbe191126
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/tr/tridactyl-native/package.nix
@@ -0,0 +1,30 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage {
+  pname = "tridactyl-native";
+  version = "0.3.7";
+
+  src = fetchFromGitHub {
+    owner = "tridactyl";
+    repo = "native_messenger";
+    rev = "62f19dba573b924703829847feb1bfee68885514";
+    sha256 = "sha256-YGDVcfFcI9cRCCZ4BrO5xTuI9mrGq1lfbEITB7o3vQQ=";
+  };
+
+  lockFile = ./lock.json;
+
+  installPhase = ''
+    mkdir -p "$out/lib/mozilla/native-messaging-hosts"
+    sed -i -e "s|REPLACE_ME_WITH_SED|$out/bin/native_main|" "tridactyl.json"
+    cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/"
+  '';
+
+  meta = with lib; {
+    description =
+      "Native messenger for Tridactyl, a vim-like Firefox webextension";
+    homepage = "https://github.com/tridactyl/native_messenger";
+    license = licenses.bsd2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ timokau dit7ya ];
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix b/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix
new file mode 100644
index 000000000000..b0a389e29ec4
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/tr/trigger-control/package.nix
@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, makeWrapper
+, pkg-config
+, SDL2
+, dbus
+, libdecor
+, libnotify
+, dejavu_fonts
+, gnome
+}:
+
+let
+  inherit (gnome) zenity;
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "trigger-control";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "Etaash-mathamsetty";
+    repo = "trigger-control";
+    # upstream does not use consistant tags pattern, so we use git commit hash
+    # https://github.com/Etaash-mathamsetty/trigger-control/tags
+    rev = "7b46e743227830d3a97720067d0a6cf20133af90";
+    hash = "sha256-nWSvsgksZ4Cxy1+i0xy8pNalgsiAuaqxNVwT/CThaBI=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    dbus
+    libnotify
+  ] ++ lib.optionals stdenv.isLinux [
+    libdecor
+  ];
+
+  patches = [
+    # Fix build on clang https://github.com/Etaash-mathamsetty/trigger-control/pull/23
+    (fetchpatch {
+      name = "clang.patch";
+      url = "https://github.com/Etaash-mathamsetty/trigger-control/commit/bbec33296fdac7e2ca0398ae19ca8de8ad883407.patch";
+      hash = "sha256-x6RymdzBlzAJ8O8QGqXQtvkZkjdTaC5X8syFPunqZik=";
+    })
+  ];
+
+  # The app crashes without a changed fontdir and upstream recommends dejavu as font
+  postPatch = ''
+    substituteInPlace trigger-control.cpp --replace "/usr/share/fonts/" "${dejavu_fonts}/share/fonts/"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D trigger-control $out/bin/trigger-control
+
+    runHook postInstall
+  '';
+
+  postInstall = lib.optionalString stdenv.isLinux ''
+    wrapProgram $out/bin/trigger-control \
+      --prefix PATH : ${lib.makeBinPath [ zenity ]}
+  '';
+
+  meta = with lib; {
+    description = "Control the dualsense's triggers on Linux (and Windows) with a gui and C++ api";
+    homepage = "https://github.com/Etaash-mathamsetty/trigger-control";
+    license = licenses.mit;
+    mainProgram = "trigger-control";
+    maintainers = with maintainers; [ azuwis ];
+    platforms = platforms.all;
+  };
+})
diff --git a/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix b/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix
index 6c8b7055fc68..6ef55446de55 100644
--- a/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix
+++ b/nixpkgs/pkgs/by-name/tr/trunk-ng/package.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "trunk-ng";
-  version = "0.17.10";
+  version = "0.17.11";
 
   src = fetchFromGitHub {
     owner = "ctron";
     repo = "trunk";
     rev = "v${version}";
-    hash = "sha256-F2g/GMxnS5r44i3NIJGOic9f+H5+JbFi3dqMqI6h6JQ=";
+    hash = "sha256-ZaSWfuz0w9bkilpDv4EAt6gn6ZdKOLTYJlJMQqtZAwY=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   # requires network
   checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
 
-  cargoHash = "sha256-37nCqRTgbsg2cXu4xwYC/qfodPIxx97Qns8FQe9NroQ=";
+  cargoHash = "sha256-O3e8v0r76VeMYODah2RYTmwr9WNAX+HPhYVmDuP2gfg=";
 
   meta = with lib; {
     homepage = "https://github.com/ctron/trunk";