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

Merge master into staging-next

parents 3b8cf433 c5887df7

pkgs/applications/editors/emacs/generic.nix

+6 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
  else if withAthena then "athena"

  else "lucid")

, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd

, withTreeSitter ? lib.versionAtLeast version "29", tree-sitter ? null

}:



assert (libXft != null) -> libpng != null;      # probably a bug
@@ -58,6 +59,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null && !withPgtk; 
assert withGTK3 -> !withGTK2 && ((gtk3-x11 != null) || withPgtk);

assert withPgtk -> withGTK3 && !withX && gtk3 != null;

assert withXwidgets -> withGTK3 && webkitgtk != null;

assert withTreeSitter -> tree-sitter != null;





(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
@@ -164,7 +166,8 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; 
      ImageCaptureCore GSS ImageIO

    ]

    ++ lib.optionals stdenv.isDarwin [ sigtool ]

    ++ lib.optionals nativeComp [ libgccjit ];

    ++ lib.optionals nativeComp [ libgccjit ]

    ++ lib.optionals withTreeSitter [ tree-sitter ];



  hardeningDisable = [ "format" ];
@@ -193,6 +196,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; 
    ++ lib.optional withImageMagick "--with-imagemagick"

    ++ lib.optional withXinput2 "--with-xinput2"

    ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"

    ++ lib.optional withTreeSitter "--with-tree-sitter"

  ;



  installTargets = [ "tags" "install" ];
@@ -241,6 +245,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; 


  passthru = {

    inherit nativeComp;

    treeSitter = withTreeSitter;

    pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);

    tests = { inherit (nixosTests) emacs-daemon; };

  };

pkgs/applications/misc/1password/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ let 
    if extension == "zip" then fetchzip args else fetchurl args;



  pname = "1password-cli";

  version = "2.14.0";

  version = "2.15.0";

  sources = rec {

    aarch64-linux = fetch "linux_arm64" "sha256-Pmfdz6jGWuRS76/35/+Al5gAbJ7rFyQQLB9tQr1Ecv8=" "zip";

    i686-linux = fetch "linux_386" "sha256-UQfoof5yuSiMjIWcbSuE45dhJ41MionPcMn8uAwP6I8=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-sx3wgAvazgWjSQMQxVE0irDXCNnDAPBivKQTUC3bZ08=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-pFoOoE329jSzshaHo/XFTIirKsxfdz1yOA0Ljb9VNkY=" "pkg";

    aarch64-linux = fetch "linux_arm64" "sha256-D+i+RrPBwFHDL7ExiZUL/xc7vBcfHI7C6z0gNIs/Brs=" "zip";

    i686-linux = fetch "linux_386" "sha256-Y19dbv9eQJF3V+94bByfWLUeDuJ78fUM9vJf1/Nd3rI=" "zip";

    x86_64-linux = fetch "linux_amd64" "sha256-Mxp6wCwBUNNucN0W0awghUzg2OQTkrwXsZgS/nVP41M=" "zip";

    aarch64-darwin = fetch "apple_universal" "sha256-KJVXW2Ze1AmDWNeTEfr7SsZMBmLyMfBv/FgC+XAds0A=" "pkg";

    x86_64-darwin = aarch64-darwin;

  };

  platforms = builtins.attrNames sources;

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

+19 −19
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ 
    "vendorHash": null

  },

  "cloudamqp": {

    "hash": "sha256-gUOWUvdlmn+u6IL6UrzA8MKErl43VmtIqnilzUTKuis=",

    "hash": "sha256-W+TuJhLP1bFTjSzLrkq9cqtt4uQB0yA/evFi8p4P0vs=",

    "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",

    "owner": "cloudamqp",

    "repo": "terraform-provider-cloudamqp",

    "rev": "v1.24.0",

    "rev": "v1.24.1",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M="

  },
@@ -420,11 +420,11 @@ 
    "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="

  },

  "github": {

    "hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=",

    "hash": "sha256-5HOGOISVozkwJU1/CRpzBOqChWEG3TTNrE5tssgWtH8=",

    "homepage": "https://registry.terraform.io/providers/integrations/github",

    "owner": "integrations",

    "repo": "terraform-provider-github",

    "rev": "v5.18.0",

    "rev": "v5.18.3",

    "spdx": "MIT",

    "vendorHash": null

  },
@@ -621,11 +621,11 @@ 
    "vendorHash": "sha256-UnWHUD9T4nTT6Y2UrvBIdIk9eA8l0vWJ/IpEY3PIzDU="

  },

  "ksyun": {

    "hash": "sha256-mq0wE9jkn67HFyg0MgtD9lY7lk0+4/rnPLJ4mXX0xwY=",

    "hash": "sha256-1P4iv9UbSUepsKP+xKvy+YTHAIemMkwQruTrHyAsxsI=",

    "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun",

    "owner": "kingsoftcloud",

    "repo": "terraform-provider-ksyun",

    "rev": "v1.3.66",

    "rev": "v1.3.67",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ="

  },
@@ -783,13 +783,13 @@ 
    "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4="

  },

  "ns1": {

    "hash": "sha256-fPeWs1VMsCY+OywHdwP9EUyjpoTYquBqP8W08Z/0DAA=",

    "hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=",

    "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",

    "owner": "ns1-terraform",

    "repo": "terraform-provider-ns1",

    "rev": "v2.0.0",

    "rev": "v2.0.2",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-R4q9ASqTdKv4BG4zNktKsLxa6UU42UzWTLYHuRnJ4Zg="

    "vendorHash": "sha256-dGHT3mq5a+3KhNZQkYZ+HYrqxR9YT7Yn64UkmE0vz6M="

  },

  "null": {

    "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=",
@@ -1045,13 +1045,13 @@ 
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="

  },

  "spotinst": {

    "hash": "sha256-a/WXuEIvFsbYGoIDT0vHNM1LoFs7VlqmGXHDszON/rU=",

    "hash": "sha256-mbqnFKxHSh4IF+zPpT2wIz1/dJKpuM7TUHS0Cvt/srg=",

    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",

    "owner": "spotinst",

    "repo": "terraform-provider-spotinst",

    "rev": "v1.105.0",

    "rev": "v1.106.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-juso8uzTjqf/vxUmpiv/07WkqMJRS1CqHQhu6pHf7QY="

    "vendorHash": "sha256-TxTw+13HJDHDdLhGjM3SXOL87RJdRFs0Y+t/oK81DfI="

  },

  "stackpath": {

    "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1090,20 +1090,20 @@ 
    "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="

  },

  "talos": {

    "hash": "sha256-Uj4UlxPvI80og/wJPtQgyrejXLcfc6R4IJfsXiVNm+Y=",

    "hash": "sha256-/Ml+Vsh50U5CoVdnls69iTPoSPpgAtOpO2hWlcmbyKw=",

    "homepage": "https://registry.terraform.io/providers/siderolabs/talos",

    "owner": "siderolabs",

    "repo": "terraform-provider-talos",

    "rev": "v0.1.1",

    "rev": "v0.1.2",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="

    "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="

  },

  "tencentcloud": {

    "hash": "sha256-+VzUyIDQcDyoMVH113cMd6jCUIsAIw/Ir1wM+/YIefM=",

    "hash": "sha256-iQHueKyp1bYj5/hRDmUFENSc5V7Q3+eq3mmYGIvPOG8=",

    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",

    "owner": "tencentcloudstack",

    "repo": "terraform-provider-tencentcloud",

    "rev": "v1.79.14",

    "rev": "v1.79.15",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -1254,12 +1254,12 @@ 
    "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ="

  },

  "yandex": {

    "hash": "sha256-0P8R0L5PGrDKWGd92OkKi9WCfMK5IrdYJyoINaZWZjc=",

    "hash": "sha256-XT31rLurZAvjE08cAGIkd7pcS1LMdOIU6e60qLrLsXI=",

    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",

    "owner": "yandex-cloud",

    "proxyVendor": true,

    "repo": "terraform-provider-yandex",

    "rev": "v0.86.0",

    "rev": "v0.87.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-r2+ARKvTghscGBhmZpz84vdBudiy2OsmQR03oDz5gbs="

  }

pkgs/build-support/emacs/wrapper.nix

+11 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ let 


  nativeComp = emacs.nativeComp or false;



  treeSitter = emacs.treeSitter or false;



in



packagesFun: # packages explicitly requested by the user
@@ -109,6 +111,9 @@ runCommand 
        ${optionalString nativeComp ''

          mkdir -p $out/share/emacs/native-lisp

        ''}

        ${optionalString treeSitter ''

          mkdir -p $out/lib

        ''}



        local requires

        for pkg in $explicitRequires; do
@@ -133,6 +138,9 @@ runCommand 
          ${optionalString nativeComp ''

            linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp"

          ''}

          ${optionalString treeSitter ''

            linkPath "$1" "lib" "lib"

          ''}

        }



        # Iterate over the array of inputs (avoiding nix's own interpolation)
@@ -164,6 +172,9 @@ runCommand 
        ${optionalString nativeComp ''

          (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/")

        ''}

        ${optionalString treeSitter ''

          (add-to-list 'treesit-extra-load-path "$out/lib/")

        ''}

        EOF



        # Generate a subdirs.el that statically adds all subdirectories to load-path.

pkgs/development/libraries/zchunk/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation rec {

  pname = "zchunk";

  version = "1.2.3";

  version = "1.3.0";



  src = fetchFromGitHub {

    owner = "zchunk";

    repo = pname;

    rev = version;

    hash = "sha256-YzCEQuG38lVhCwZznhIyny6Yya8iNuhdqgYBz9OhGOc=";

    hash = "sha256-9T1u2Qvy2gRUQzgAp81x+tSbHXuEoxhYhS1T9XntvKk=";

  };



  nativeBuildInputs = [