gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-05-15 00:39:52 +00:00
committed by GitHub
parent c943c9fcaa 32219302a9
commit fd8778e01f
5 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/terraform-providers/providers.json
+3 -3
View File
@@ -896,13 +896,13 @@
"vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58="
},
"metio_migadu": {
"hash": "sha256-z3xHms9rHbPa6pTspOwXNOrNG4i03yQCfLOR/Q0g0+Y=",
"hash": "sha256-WpJj2k+ZUjImbvLwXExaUO0Q1wn/QioTERzf5eQZqrU=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2026.3.5",
"rev": "2026.5.14",
"spdx": "0BSD",
"vendorHash": "sha256-L1Pund4PgtvEu+76GWgfsPP6lUlN1xiDydW+n6nKNHE="
"vendorHash": "sha256-wpQ+2hV6lEKAJByJCh6SZSDF9CQ46IjiC7JRz0+NvwI="
},
"mongey_kafka": {
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
pkgs/build-support/build-mozilla-mach/default.nix
-19
View File
@@ -332,25 +332,6 @@ buildStdenv.mkDerivation {
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
./139-wayland-drag-animation.patch
]
# Revert apple sdk bump to 26.1 and 26.2
++
lib.optionals (lib.versionAtLeast version "148" && lib.versionOlder apple-sdk_26.version "26.2")
[
(fetchpatch {
url = "https://github.com/mozilla-firefox/firefox/commit/73cbb9ff0fdbf8b13f38d078ce01ef6ec0794f9c.patch";
hash = "sha256-ghdddJxsaxXzLZpOOfwss+2S/UUcbLqKGzWWqKy9h/k=";
revert = true;
})
]
++
lib.optionals (lib.versionAtLeast version "146" && lib.versionOlder apple-sdk_26.version "26.1")
[
(fetchpatch {
url = "https://github.com/mozilla-firefox/firefox/commit/c1cd0d56e047a40afb2a59a56e1fd8043e448e05.patch";
hash = "sha256-bFHLy3b0jOcROqltIwHwSAqWYve8OZHbiPMOdhLUCLc=";
revert = true;
})
]
++ extraPatches;
postPatch = ''
pkgs/by-name/cu/curl-impersonate/package.nix
+2 -2
View File
@@ -27,7 +27,7 @@
}:
stdenv.mkDerivation rec {
pname = "curl-impersonate";
version = "1.5.5";
version = "1.5.6";
outputs = [
"out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "lexiforest";
repo = "curl-impersonate";
tag = "v${version}";
hash = "sha256-iKtNdBjAflg9evd/CmKJd8pXGPUM5sMBJEgJAbJ6vws=";
hash = "sha256-t4fdTp/pb00dcuelvvZyN7ZdgLoQt3nbYXU9sW9jlS8=";
};
# Disable blanket -Werror to fix build on `gcc-13` related to minor
pkgs/by-name/mi/mirrord/manifest.json
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.209.1",
"version": "3.210.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.209.1/mirrord_linux_x86_64",
"hash": "sha256-XXSU13UhffwgIIdfPW3vjPOcvtrggs2bKpsMkwUdv8Y="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_x86_64",
"hash": "sha256-eg7eO97SHZQoju/wH/6IvyEmLi//HXLsDJ3AjeJyPA8="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.209.1/mirrord_linux_aarch64",
"hash": "sha256-RiQsrGAOfRe8kRmNF8imJjP+ZktUpUuMvNGmMI0fboc="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_aarch64",
"hash": "sha256-J+2jHv3/QhpxOHoCMTJMr1k8TTQfQVYjPGuZeZ0GufQ="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.209.1/mirrord_mac_universal",
"hash": "sha256-Lkqk9CgOnMFMUut6JRU5V4IimI1ys/iVX1M5DxOtOMk="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
"hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.209.1/mirrord_mac_universal",
"hash": "sha256-Lkqk9CgOnMFMUut6JRU5V4IimI1ys/iVX1M5DxOtOMk="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
"hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
}
}
}
pkgs/desktops/pantheon/desktop/gala/default.nix
+2 -2
View File
@@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gala";
version = "8.5.0";
version = "8.5.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "gala";
tag = finalAttrs.version;
hash = "sha256-Ih0ohyxDCTw3UHGHIP1JQSTi9mGBG5R6HIAJJRPERrQ=";
hash = "sha256-f+/RaKG208v84q1V9NkDci0wuGAtXwjVsF7ITDAgHCQ=";
};
depsBuildBuild = [ pkg-config ];