Unverified Commit ea2bc2c0 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 91256b82 884ffbd8

pkgs/applications/audio/spotify/linux.nix

+2 −2
Original line number Diff line number Diff line 
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype

, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify

, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify

, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome

, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon

, pname, meta, harfbuzz
@@ -47,7 +47,7 @@ let 
    libpulseaudio

    libxkbcommon

    mesa

    nss

    nss_latest

    pango

    stdenv.cc.cc

    systemd

pkgs/applications/editors/cudatext/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cudatext";

  version = "1.193.0";

  version = "1.193.3";



  src = fetchFromGitHub {

    owner = "Alexey-T";

    repo = "CudaText";

    rev = version;

    hash = "sha256-vMTE6oe11ajO+Dw5pcgXEKSl8LR+3GI4DHH5KxS3Msw=";

    hash = "sha256-zkSdMXIfUT+QfRi7CT3JlVLAvtLGbOGAaQkYNMAIZeI=";

  };



  postPatch = ''

pkgs/applications/editors/cudatext/deps.json

+4 −4
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
  },

  "ATFlatControls": {

    "owner": "Alexey-T",

    "rev": "2023.05.04",

    "hash": "sha256-VdjLHbgj5i7gEavnGLvPlBBlo5HPYUIBX78pkD2CbwI="

    "rev": "2023.05.07",

    "hash": "sha256-B1+de0ze17GTAFuWxgmk95sdYiUmDGdeNTJmyy74Vmc="

  },

  "ATSynEdit": {

    "owner": "Alexey-T",

    "rev": "2023.05.02",

    "hash": "sha256-E3XBPzd8D8SMhjXOj16syzdMgryzOVPxnEuZwpO7Czw="

    "rev": "2023.05.07",

    "hash": "sha256-ZdN+dUmM8DQ7nz0LqcCQt8ZoJH1wrhYRa+h0xj5F6PY="

  },

  "ATSynEdit_Cmp": {

    "owner": "Alexey-T",

pkgs/applications/networking/cluster/terraform-providers/providers.json

+5 −5
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ 
    "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="

  },

  "argocd": {

    "hash": "sha256-3WhbyMqIlncD7UmmfJBFrb9FmmbC/a4CWesmjo0jzoU=",

    "hash": "sha256-PZ+fcLRU8nA+i93FXntIt0Mbauykifd9iCItwlPdsrk=",

    "homepage": "https://registry.terraform.io/providers/oboukili/argocd",

    "owner": "oboukili",

    "repo": "terraform-provider-argocd",

    "rev": "v5.2.0",

    "rev": "v5.3.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk="

    "vendorHash": "sha256-+uWVo5UM2tuYXYn2eWf7yuAQ8THYvJSc5ZxD909bQSk="

  },

  "auth0": {

    "hash": "sha256-UHsGiMV81AfjxqTcWuLKXQM3o6F+STQcHdni3j8A5wM=",
@@ -1116,11 +1116,11 @@ 
    "vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc="

  },

  "thunder": {

    "hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=",

    "hash": "sha256-CZjoWme/f1F5JzYlntEKL5ijRF/qR3h4ZTiv9vwzbJI=",

    "homepage": "https://registry.terraform.io/providers/a10networks/thunder",

    "owner": "a10networks",

    "repo": "terraform-provider-thunder",

    "rev": "v1.2.1",

    "rev": "v1.2.2",

    "spdx": "BSD-2-Clause",

    "vendorHash": null

  },

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

+3 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ let 


  self = python3Packages.buildPythonApplication rec {

    pname = "mercurial${lib.optionalString fullBuild "-full"}";

    version = "6.4.2";

    version = "6.4.3";



    src = fetchurl {

      url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";

      sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU=";

      sha256 = "sha256-p3+2LTJZNKg6ALL8bbEJ9ExnuGdo/EBJA2b1E2QMf2Q=";

    };



    format = "other";
@@ -35,7 +35,7 @@ let 
    cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {

      inherit src;

      name = "mercurial-${version}";

      sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M=";

      sha256 = "sha256-nm9RZZHtmPfeJ7StHZmfxcFqKeJHACQQeA/Evv3wYD8=";

      sourceRoot = "mercurial-${version}/rust";

    } else null;

    cargoRoot = if rustSupport then "rust" else null;