Unverified Commit e40d38e1 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #312133: staging-next 2024-05-15 - last for 24.05

parents 7a35ba84 7b015fba

pkgs/applications/graphics/rawtherapee/default.nix

+9 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchurl

, cmake

, pkg-config

, wrapGAppsHook3
@@ -37,6 +38,14 @@ stdenv.mkDerivation rec { 
    forceFetchGit = true;

  };



  # https://github.com/Beep6581/RawTherapee/issues/7074

  patches = [

    (fetchurl {

      url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff";

      hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM=";

    })

  ];



  postPatch = ''

    echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake

    substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \

pkgs/applications/networking/browsers/chromium/common.nix

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
, pkgsBuildHost

# configurePhase:

, gnChromium

, symlinkJoin



# Build inputs:

, libpng
@@ -378,6 +379,14 @@ let 
      ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .

    '';



    llvmCcAndBintools = symlinkJoin {

      name = "llvmCcAndBintools";

      paths = [

        pkgsBuildTarget.${llvmPackages_attrName}.llvm

        pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc

      ];

    };



    gnFlags = mkGnFlags ({

      # Main build and toolchain settings:

      # Create an official and optimized release build (only official builds
@@ -445,7 +454,7 @@ let 
      rtc_use_pipewire = true;

      # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):

      chrome_pgo_phase = 0;

      clang_base_path = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}";

      clang_base_path = "${llvmCcAndBintools}";

      use_qt = false;

      # To fix the build as we don't provide libffi_pic.a

      # (ld.lld: error: unable to find library -l:libffi_pic.a):

pkgs/applications/networking/instant-messengers/element/keytar/default.nix

+12 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, nodejs, python3, callPackage, removeReferencesTo

{ lib, stdenv, fetchFromGitHub, nodejs, python3, removeReferencesTo

, pkg-config, libsecret, xcbuild, Security, AppKit, fetchNpmDeps, npmHooks }:



let
@@ -31,6 +31,17 @@ in stdenv.mkDerivation rec { 


  doCheck = false;



  postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

    pkg-config() { "''${PKG_CONFIG}" "$@"; }

    export -f pkg-config

  '';



  # https://nodejs.org/api/os.html#osarch

  npmFlagsArray = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32"

                             else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64"

                             else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64"

                             else stdenv.hostPlatform.parsed.cpu.name}" ];



  installPhase = ''

    runHook preInstall

    shopt -s extglob

pkgs/applications/networking/instant-messengers/element/seshat/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, CoreServices, fetchYarnDeps, removeReferencesTo }:

{ lib, stdenv, rustPlatform, fetchFromGitHub, rust, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, CoreServices, fetchYarnDeps, removeReferencesTo }:



let

  pinData = lib.importJSON ./pin.json;
@@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec { 
    fixup-yarn-lock yarn.lock

    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive

    patchShebangs node_modules/

    node_modules/.bin/neon build --release

    node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release

    runHook postBuild

  '';

pkgs/applications/version-management/git/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; 
assert svnSupport -> perlSupport;



let

  version = "2.44.0";

  version = "2.44.1";

  svn = subversionClient.override { perlBindings = perlSupport; };

  gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];

in
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 


  src = fetchurl {

    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";

    hash = "sha256-41hzjctbXqNAzpAKABXAOuhugE5/9k5HqkYx3e5oHeM=";

    hash = "sha256-e2CmJMD3AJoWuFYlBiGq/c3YXrjUS7AgYXtlJbhyYeQ=";

  };



  outputs = [ "out" ] ++ lib.optional withManual "doc";