Unverified Commit 239b03c1 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #331115 from linsui/pot 

pot: 2.7.9 -> 3.0.5
parents f6b526e1 6217fb14

pkgs/by-name/po/pot/Cargo.lock

+2262 −1032

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/po/pot/package.nix

+45 −35
Original line number Diff line number Diff line 
{ lib

, stdenv

, rustPlatform

, fetchFromGitHub

, nodejs

, pnpm

, wrapGAppsHook3

, cargo

, rustc

, cargo-tauri

, pkg-config

, esbuild

, buildGoModule

, libayatana-appindicator

, gtk3

, webkitgtk

, libsoup

, openssl

, xdotool

{

  lib,

  stdenv,

  rustPlatform,

  fetchFromGitHub,

  nodejs,

  pnpm_9,

  wrapGAppsHook3,

  cargo,

  rustc,

  cargo-tauri,

  pkg-config,

  esbuild,

  buildGoModule,

  libayatana-appindicator,

  gtk3,

  webkitgtk,

  libsoup,

  openssl,

  xdotool,

}:



let

  pnpm = pnpm_9;

in

stdenv.mkDerivation (finalAttrs: {

  pname = "pot";

  version = "2.7.9";

  version = "3.0.5";



  src = fetchFromGitHub {

    owner = "pot-app";

    repo = "pot-desktop";

    rev = finalAttrs.version;

    hash = "sha256-Y2gFLvRNBjOGxdpIeoY1CXEip0Ht73aymWIP5wuc9kU=";

    hash = "sha256-Y0/N5xunEXOG+FuZE23xsSwFd6PL1XClV5UIckTYNPs=";

  };



  sourceRoot = "${finalAttrs.src.name}/src-tauri";
@@ -39,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { 


  pnpmDeps = pnpm.fetchDeps {

    inherit (finalAttrs) pname version src;

    hash = "sha256-nRRUX6CH3s1cEoI80gtRmu0ovXpIwS+h1rFJo8kw60E=";

    hash = "sha256-AmMV8Nrn+zH/9bDkFX3Mx5xIQjkoXR8SzkdJRXkxTbA=";

  };



  pnpmRoot = "..";
@@ -48,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { 
    lockFile = ./Cargo.lock;

    outputHashes = {

      # All other crates in the same workspace reuse this hash.

      "tauri-plugin-autostart-0.0.0" = "sha256-/uxaSBp+N1VjjSiwf6NwNnSH02Vk6gQZ/CzO+AyEI7o=";

      "tauri-plugin-autostart-0.0.0" = "sha256-fgJvoe3rKom2DdXXgd5rx7kzaWL/uvvye8jfL2SNhrM=";

    };

  };
@@ -72,18 +76,24 @@ stdenv.mkDerivation (finalAttrs: { 
    xdotool

  ];



  ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {

    buildGoModule = args: buildGoModule (args // rec {

      version = "0.18.20";

  env.ESBUILD_BINARY_PATH = "${lib.getExe (

    esbuild.override {

      buildGoModule =

        args:

        buildGoModule (

          args

          // rec {

            version = "0.21.5";

            src = fetchFromGitHub {

              owner = "evanw";

              repo = "esbuild";

              rev = "v${version}";

        hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";

              hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8=";

            };

      vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

    });

  })}";

          }

        );

    }

  )}";



  preConfigure = ''

    # pnpm.configHook has to write to .., as our sourceRoot is set to src-tauri

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -2876,8 +2876,6 @@ with pkgs; 














  portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { };



























  pot = callPackage ../by-name/po/pot/package.nix { pnpm = pnpm_8; };



























  potreeconverter = callPackage ../applications/graphics/potreeconverter { };





























  ranger = callPackage ../applications/file-managers/ranger { };