Unverified Commit 3029e201 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7001d067 f117875f

pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { 
      sources = {

        "x86_64-linux" = {

          arch = "linux-x64";

          hash = "sha256-tnZh8WioZ4EtooQlM5RYQkvWO35PPeNTAyCbMQ4raXE=";

          hash = "sha256-3JEqkFY1vuI11HdM+X1rZkbVOrFpykAy7CdYxtyfu+0=";

        };

        "x86_64-darwin" = {

          arch = "darwin-x64";

          hash = "sha256-tkZRGO1W0QA/aEW2BqyPhmGt06yTvrsQ4Xp8jmbzPP0=";

          hash = "sha256-yqb0PdhSpCecUxEO2ZUpFzn1wZcaDcfvFPXJW0gYgh4=";

        };

        "aarch64-linux" = {

          arch = "linux-arm64";

          hash = "sha256-hoZf3ofcPHkqyWwfL79Hnu5pzcLKRHD5PVOBjTXq828=";

          hash = "sha256-CUpfezfvhVSROFBV8ZI9W+DpwxyH6QLvhOOO8O5PYag=";

        };

        "aarch64-darwin" = {

          arch = "darwin-arm64";

          hash = "sha256-qZnHSdcby7FNb1+EUB4O8dK30xtZWS4m07m8je0/CHI=";

          hash = "sha256-AGc6wI15C7tZJAJ8yfx1xlQ8wQj/f8S3xHKwp+C/5x4=";

        };

      };

    in

    {

      name = "visualjj";

      publisher = "visualjj";

      version = "0.15.0";

      version = "0.15.1";

    }

    // sources.${stdenvNoCC.hostPlatform.system}

      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

pkgs/applications/misc/gpxsee/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
  qtserialport,

  qtsvg,

  wrapQtAppsHook,

  wrapGAppsHook3,

}:



let
@@ -48,8 +49,15 @@ stdenv.mkDerivation (finalAttrs: { 
    qmake

    qttools

    wrapQtAppsHook

    wrapGAppsHook3

  ];



  dontWrapGApps = true;



  preFixup = ''

    qtWrapperArgs+=(''${gappsWrapperArgs[@]})

  '';



  preConfigure = ''

    lrelease gpxsee.pro

  '';

pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix

+397 −397

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/am/amp/package.nix

+18 −28
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  rustPlatform,

  openssl,

  pkg-config,

  python3,

  xorg,

  cmake,

  libgit2,

  curl,

  pkgsBuildBuild,

  stdenv,

  zlib,

  writableTmpDirAsHomeHook,

}:



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "amp";

  version = "0.7.0";

  version = "0.7.1";



  src = fetchFromGitHub {

    owner = "jmacdonald";

    repo = "amp";

    tag = version;

    hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";

    tag = finalAttrs.version;

    hash = "sha256-YK+HSWTtSVLK8n7NDiif3bBqp/dQW2UTYo3yYcZ5cIA=";

  };



  cargoPatches = [ ./update_time_crate.patch ];



  useFetchCargoVendor = true;

  cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0=";

  cargoHash = "sha256-6enFOmIAYOgOdoeA+pk37+BobI5AGPBxjp73Gd4C+gI=";



  nativeBuildInputs = [

    cmake

    pkg-config

    python3

    # git rev-parse --short HEAD

    (pkgsBuildBuild.writeShellScriptBin "git" "echo 0000000")

  ];

  buildInputs =

    [

      openssl

      xorg.libxcb

      libgit2

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      curl



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

    zlib

  ];



  # Needing libgit2 <=1.8.0

  #env.LIBGIT2_NO_VENDOR = 1;



  nativeCheckInputs = [

    writableTmpDirAsHomeHook

  ];
@@ -58,4 +48,4 @@ rustPlatform.buildRustPackage rec { 
    ];

    mainProgram = "amp";

  };

}
 
})

pkgs/by-name/am/amp/update_time_crate.patch

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001

From: Drewry Pope <drewrypope@gmail.com>

Date: Wed, 28 Aug 2024 18:45:41 -0500

Subject: [PATCH] update time



---

 Cargo.lock | 16 ++++++++++++----

 1 file changed, 12 insertions(+), 4 deletions(-)



diff --git a/Cargo.lock b/Cargo.lock

index 0e1b8ff6..bd8b5814 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -864,6 +864,12 @@ dependencies = [

  "minimal-lexical",

 ]

 

+[[package]]

+name = "num-conv"

+version = "0.1.0"

+source = "registry+https://github.com/rust-lang/crates.io-index"

+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

+

 [[package]]

 name = "num-traits"

 version = "0.2.16"

@@ -1372,12 +1378,13 @@ dependencies = [

 

 [[package]]

 name = "time"

-version = "0.3.31"

+version = "0.3.36"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"

+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

 dependencies = [

  "deranged",

  "itoa",

+ "num-conv",

  "powerfmt",

  "serde",

  "time-core",

@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 

 [[package]]

 name = "time-macros"

-version = "0.2.16"

+version = "0.2.18"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"

+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

 dependencies = [

+ "num-conv",

  "time-core",

 ]