Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
K900 2026-07-06 10:03:26 +03:00
commit a9fc48d6eb
27 changed files with 115 additions and 107 deletions

View file

@ -64,6 +64,7 @@
x11Support ? false,
ffmpegSupport ? false,
embedInstallers ? false,
smartcardSupport ? false,
}:
let
@ -251,6 +252,9 @@ stdenv.mkDerivation (
++ lib.optionals ffmpegSupport [
pkgs.ffmpeg-headless
]
++ lib.optionals smartcardSupport [
pkgs.pcsclite
]
);
inherit patches;
@ -275,7 +279,8 @@ stdenv.mkDerivation (
++ lib.optionals vulkanSupport [ "--with-vulkan" ]
++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [
"--without-x"
];
]
++ lib.optionals smartcardSupport [ "--with-pcsclite" ];
# Wine locates a lot of libraries dynamically through dlopen(). Add
# them to the RPATH so that the user doesn't have to set them in

View file

@ -51,6 +51,7 @@ args@{
ffmpegSupport ? false,
embedInstallers ? false, # The Mono and Gecko MSI installers
moltenvk, # Allow users to override MoltenVK easily
smartcardSupport ? false,
}:
let

View file

@ -45,11 +45,11 @@
"vendorHash": "sha256-5IfYhOEhXRpdL7G3Op9a0Ep14el2gwcVmRMkGB7oWH4="
},
"aliyun_alicloud": {
"hash": "sha256-wBwFtW2hbBL7YkL8o7bkd3eMCmdjObIbBiuLPsmZqQo=",
"hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.282.0",
"rev": "v1.284.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4="
},
@ -1238,11 +1238,11 @@
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
},
"spacelift-io_spacelift": {
"hash": "sha256-2EGyYs8fy1y9g241spfKFwpv7ZTRJePvf06OS7EFDaU=",
"hash": "sha256-1f066NavFneIeH8X5CYGd0GmssPfzJACXt6GHvR/FLU=",
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
"owner": "spacelift-io",
"repo": "terraform-provider-spacelift",
"rev": "v1.52.2",
"rev": "v1.52.3",
"spdx": "MIT",
"vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
},

View file

@ -17,13 +17,13 @@ in
buildKodiAddon rec {
pname = "jellycon";
namespace = "plugin.video.jellycon";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellycon";
rev = "v${version}";
sha256 = "sha256-TLJalH3b1EYoIbnUhnHl8A9EF2Q6dDy0M2hl9je0K54=";
sha256 = "sha256-dpH611GZ+BG63bSFypcZ9VUtNCA/tL8zgKuaU7cCRII=";
};
nativeBuildInputs = [

View file

@ -16,14 +16,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-update";
version = "20.0.1";
version = "20.0.3";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-wV1R95TBPLXzCmE9sjztxJdvwvWxedEQPI5TxZEGUqA=";
hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0=";
};
cargoHash = "sha256-LsqDwGboCPGrRmpFqy13anszrwE8+VoqRqfm5K3VgM8=";
cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU=";
nativeBuildInputs = [
cmake

View file

@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "cfdg";
version = "3.4.2";
version = "3.4.3";
src = fetchFromGitHub {
owner = "MtnViewJohn";
repo = "context-free";
rev = "Version${version}";
sha256 = "sha256-PtkvhX5PIeN/5UDpAaVwBwfp8ykjsjfH+8iGdbNQOfI=";
sha256 = "sha256-a/HmB2AkhcibCxzHfiNjnUiYmz5hrfZVs7aZZu5IBIw=";
};
nativeBuildInputs = [

View file

@ -1,14 +1,14 @@
{
"aarch64-darwin": {
"version": "3.3.18",
"version": "3.4.22",
"vscodeVersion": "1.110.1",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/16737566f57f3b53bde136375fe0544eca12fac4/Devin-darwin-arm64-3.3.18.zip",
"sha256": "7ac789baa5d818b09f6a62315d34b55dde02b0a409a22903d0228a819ea734e7"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip",
"sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f"
},
"x86_64-linux": {
"version": "3.3.18",
"version": "3.4.22",
"vscodeVersion": "1.110.1",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/16737566f57f3b53bde136375fe0544eca12fac4/Devin-linux-x64-3.3.18.tar.gz",
"sha256": "05c7fa988c324a1633038ebe90e217d17a7f188197a5070f397460864ef41292"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz",
"sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072"
}
}

View file

@ -23,14 +23,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "filtr";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "tiagolr";
repo = "filtr";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-LRVwJ/Eh+XeNGnlbd2c56hWV8StHZGhxy0XLjGZ0toY=";
hash = "sha256-LW21Hv0Gs7csgHg9tMPa4fmZGAby64uDAOdkwhOSwx4=";
};
nativeBuildInputs = [

View file

@ -9,10 +9,10 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flyway";
version = "12.8.1";
version = "12.10.0";
src = fetchurl {
url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
sha256 = "sha256-cJLyBFM4Q1WsvB7YP0uCt/IjLK7T2b326IvFW7ePVEA=";
sha256 = "sha256-JZ0qKGqaNzND+oKMn/mQc0SBzNUxpIzX4C86Znl/9Fo=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

View file

@ -25,13 +25,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gogh";
version = "365";
version = "366";
src = fetchFromGitHub {
owner = "Gogh-Co";
repo = "Gogh";
tag = "v${finalAttrs.version}";
hash = "sha256-qK3E7ceeVqBgJ8rSotfH3K9WpxE5dS/h4a7Ml5qwlS0=";
hash = "sha256-YJLWscXslIK1NKM4hhrKT/kKQJof0Vn6uCtkcuZ3vUw=";
};
postPatch = ''

View file

@ -10,16 +10,16 @@
}:
buildGo126Module (finalAttrs: {
pname = "goreleaser";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${finalAttrs.version}";
hash = "sha256-TV03T9OZXiEa4+v1teI9YA2ilDEU4RoDY9kGdENfZqU=";
hash = "sha256-BB2URWDc5WR51uVsA0I9qhd0T6wYtmqM/jF5YAaV30o=";
};
vendorHash = "sha256-9an5C6xLxyiC4pejOZlz40ZNdc6c0A1mvekXefrCTeQ=";
vendorHash = "sha256-dSJ7F7PKGMZCoKAbu7SpJSXDKQWicoqNA3Kwl9+kGwI=";
ldflags = [
"-s"

View file

@ -11,13 +11,13 @@
}:
buildNpmPackage (finalAttrs: {
pname = "gridtracker2";
version = "2.260613.0";
version = "2.260705.2";
src = fetchFromGitLab {
owner = "gridtracker.org";
repo = "gridtracker2";
tag = "v${finalAttrs.version}";
hash = "sha256-cwsZZXIMIX19u3qlAk5b0Gi339dtuoHKSC7/rBvccJs=";
hash = "sha256-LYBzoxLCJqbGI8j9nBDFfo9PPTiVDpbT6hM4TJEab1s=";
};
npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8=";

View file

@ -31,7 +31,7 @@ let
};
in
stdenv.mkDerivation (finalAttrs: {
version = "16.4.1";
version = "16.4.11";
pname = "jmol";
src =
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
in
fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${finalAttrs.version}/Jmol-${finalAttrs.version}-binary.tar.gz";
hash = "sha256-n7Ql/pK/N6maG2EjrgdRz+HUvn+JwkZpvRQyuElKrHI=";
hash = "sha256-kDt6XF5axy9DhygLZcImV37plkq/xDqi2aL2wKV9wh4=";
};
patchPhase = ''

View file

@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
# "chatgpt-cli" is taken by another package with the same upsteam name.
# To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
pname = "kardolus-chatgpt-cli";
version = "1.10.11";
version = "1.10.12";
src = fetchFromGitHub {
owner = "kardolus";
repo = "chatgpt-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-XHrjjV7hMf6y9TA4Icj9AQ6Wa1Z5mxGXGlZ22BG18Ro=";
hash = "sha256-X+QfmoVY8J+D9WEQ6GS7ws5sFUh/2yfszyLkNCRy4gc=";
};
vendorHash = null;
# The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.11/test/contract/contract_test.go#L35)
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.12/test/contract/contract_test.go#L35)
# which will not be the case in the pipeline.
# Therefore, tests must be skipped.
doCheck = false;

View file

@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "ko";
version = "0.19.0";
version = "0.19.1";
src = fetchFromGitHub {
owner = "ko-build";
repo = "ko";
tag = "v${finalAttrs.version}";
hash = "sha256-bt3YjEpHE7h27rl4PeACN3AnRE2NNHd4dSJxbqPqS8U=";
hash = "sha256-HO2ByHyAVWM96JMegerysB13SqbZw/hE8uH5FHsHJao=";
};
vendorHash = "sha256-TR4k9kwLIfh9RZd4Tt1cw2Z9UpMB+pgal2OXkhtCY8I=";
vendorHash = "sha256-f9eSrBhevZ+eS/ct28GoDfoGu1NT+hVLvZwi2euqBe0=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "spacectl";
version = "1.23.0";
version = "1.24.0";
src = fetchFromGitHub {
owner = "spacelift-io";
repo = "spacectl";
rev = "v${finalAttrs.version}";
hash = "sha256-9YhA1clYaPbrY/kAS51Qo20EDPSPOKwN5iLUUJ4sE60=";
hash = "sha256-XyEV45z/f4X8LXATWngakqjm5qSszry1jk4Jzag54gA=";
};
vendorHash = "sha256-1ue5NHt/+QCtmzwQder6H7WqRBJ42on53ixuD+wiZpg=";

View file

@ -7,16 +7,16 @@
}:
buildGoModule (finalAttrs: {
pname = "spicetify-cli";
version = "2.43.2";
version = "2.44.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-77OZVDtybkYI5R3tZ7q2cLJ+Ixn8WB4CP4qP6Yp535g=";
hash = "sha256-4RRy1mmqjKxDUqSV7W6KHZZcbsJvnB2hZpys1MPip3E=";
};
vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec=";
vendorHash = "sha256-FTTJJrPFqqWLBBQ6pQ0RZRaWUZ4MxsV5e9HGPOp2jOY=";
postPatch = ''
substituteInPlace src/preprocess/preprocess.go \

View file

@ -9,7 +9,7 @@
buildGoModule (finalAttrs: {
pname = "supabase-cli";
version = "2.108.0";
version = "2.109.0";
__structuredAttrs = true;
@ -17,13 +17,13 @@ buildGoModule (finalAttrs: {
owner = "supabase";
repo = "cli";
tag = "v${finalAttrs.version}";
hash = "sha256-zhtt6JksIEZyfATxPDyZvf97syk9Z1kOXvzNgZxB1fI=";
hash = "sha256-5AfSH69poNnUlK7oT9W5k37DjcitCOSJEPBtnRMUqVc=";
};
# Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli.
sourceRoot = "${finalAttrs.src.name}/apps/cli-go";
vendorHash = "sha256-VKEhmPdj0IJYSVncCRhfxqbjdZ/1WwdIBZgxMkS/65o=";
vendorHash = "sha256-yHNtzzdYhCgBSb/VwGe2cqmZwNNwrKLVg2RVE0Nwq1M=";
ldflags = [
"-s"

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tbox";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "tboox";
repo = "tbox";
rev = "v${finalAttrs.version}";
hash = "sha256-Z84cUPixXRrB1Zwc16ipjM9Zvr7QWdxRHdRHjTY7fhE=";
hash = "sha256-tUN9H6TejbFbJR4Lr0N8HoYkRAo8a/Rh4HEMOG1aPoE=";
};
configureFlags = [

View file

@ -21,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "tk-safe";
version = "26.1.1";
revision = "27";
version = "26.2.4";
revision = "28";
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_${revision}.snap";
hash = "sha512-idCFUt0nzg5rM2HXvuMzPPzukmvHSMxCEX+PIM/23A8j8IT3IhUQCvZLaXLnUs6eb1hWNvsNEr+XlaM8cSTdWA==";
hash = "sha512-5C0J4WFrlBUCGnNhHfi4TrZmDnu/ws/+ATSP2LmoPRhmjoJkW0WFmkwMzaEkbsrunpyK2g5c3gGFvuVlHJwTFQ==";
};
desktopItems = [

View file

@ -15,13 +15,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "tsx";
version = "4.22.4";
version = "4.23.0";
src = fetchFromGitHub {
owner = "privatenumber";
repo = "tsx";
tag = "v${finalAttrs.version}";
hash = "sha256-hiUy3VQXHvzuCr+WjaRV/pUcnz3bq29lmpofqKZ/sv8=";
hash = "sha256-De/l8Z7+VAwkOZmAZZumqJBIMrDNhY9DM0fh4LuTWZM=";
};
pnpmDeps = fetchPnpmDeps {
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm';
fetcherVersion = 3;
hash = "sha256-A0KaFJNBJaMDTG9g8dj3/qZPkqg5hnRgjP0lfTg/CQY=";
hash = "sha256-kd28ZK1c7a/h7ZNf0fQuJdNUiuvJ1a9qvQut4Ms4xuo=";
};
nativeBuildInputs = [

View file

@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "xlights";
version = "2026.11";
version = "2026.12";
src = fetchurl {
url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
hash = "sha256-kTJD2xeclNApeSo1ALNI/XAwDY8tsBO0eMMQurtRF/M=";
hash = "sha256-aMOnG80gEZcCo1vIYcyRCTRhJIbcNPEEsmacfRLIoxY=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

View file

@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mcfgthread";
version = "2.3.2";
version = "2.4.1";
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
hash = "sha256-1gD2Cu2suvxopTxGN2RYSzise6bS8lpkrXLcdm9ZBLU=";
hash = "sha256-zQAH/Kdcl9+sSlu8WIJfNMR4KyJ+plenEa5q9rEIf/M=";
};
postPatch = ''

View file

@ -7,11 +7,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mingw_w64-headers";
version = "13.0.0";
version = "14.0.0";
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2";
hash = "sha256-Wv6CKvXE7b9n2q9F7sYdU49J7vaxlSTeZIl8a5WCjK8=";
hash = "sha256-bq+SHZ65h9OCCzZOqXdbwZuWXsgUkLb91xZSbCjhmVw=";
};
configureFlags = [

View file

@ -1,5 +1,5 @@
{
"x86_64": "sha256-rEHwc09hLh3dKvA2TYHJKeFDycajPe8Ewfcdw85QY48=",
"x86": "sha256-yibiyIwGe9kSJzTFpDc8ilF65aKQ9qMLrx2k14uM4Zk=",
"aarch64": "sha256-RB/Hubhm+73kPUiKOKtm6vwf2ldm1raezNmmGEdQf9w="
"x86_64": "sha256-KDnGlTJRR+3mN8dZqTEQuO0W6Ru9ogs0DkOIPaCHPcs=",
"aarch64": "sha256-dcmND3u576CqaImo8cjNBuW34nvFxSulc5zs3g21xxU=",
"x86": "sha256-yjOKaYpYJ9PYTDQIZhLz1/qn2p/Lqj/H2cM5t2LjR9s="
}

File diff suppressed because one or more lines are too long

View file

@ -57,6 +57,7 @@ lib.makeExtensible (
gphoto2Support = true;
krb5Support = true;
embedInstallers = true;
smartcardSupport = true;
};
stable = self.base.override { wineRelease = "stable"; };