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

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-16 06:05:15 +00:00
committed by GitHub
parent c55942667a fdb40c313f
commit 7d8b48d66b
24 changed files with 153 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/android-studio/default.nix
+4 -4
View File
@@ -20,12 +20,12 @@ let
sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI=";
};
betaVersion = {
version = "2024.3.2.10"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 1"
sha256Hash = "sha256-r5YBpACLzfmChY9ORyvDUNl4j8r32dsqj3W7fbSWZU8=";
version = "2024.3.2.11"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 2"
sha256Hash = "sha256-pE17kbLnsEMRtaQencKqckW3uke9IliLkoHP6q3NrQg=";
};
latestVersion = {
version = "2025.1.1.4"; # "Android Studio Narwhal | 2025.1.1 Canary 4"
sha256Hash = "sha256-PQe9JEi9Ogoo1hUgPVnCustFgg10v89gTMF7QGi4s1I=";
version = "2025.1.1.6"; # "Android Studio Narwhal | 2025.1.1 Canary 6"
sha256Hash = "sha256-FUDb8/kyvO3M/NJp30VZCyNacJ90y/fawrDTFin7g6o=";
};
in
{
pkgs/applications/editors/emacs/build-support/generic.nix
+1 -2
View File
@@ -61,8 +61,7 @@ lib.extendMkDerivation {
propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs;
strictDeps = args.strictDeps or true;
# TODO re-enable after #392928 reaches master
# __structuredAttrs = args.__structuredAttrs or true;
__structuredAttrs = args.__structuredAttrs or true;
inherit turnCompilationWarningToError ignoreCompilationError;
pkgs/applications/misc/1password-gui/default.nix
+1
View File
@@ -37,6 +37,7 @@ let
timstott
savannidgerinel
sebtm
bdd
];
platforms = builtins.attrNames sources.${channel};
mainProgram = "1password";
pkgs/applications/misc/1password-gui/sources.json
+8 -8
View File
@@ -1,20 +1,20 @@
{
"stable": {
"x86_64-linux": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.70.x64.tar.gz",
"hash": "sha256-QGKeKX7qxu7heJ6T0I8aayI1P2M3KOmU9faS929BCjI="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.72.x64.tar.gz",
"hash": "sha256-vJJ5Dh3K3B0DAEVMifiITNJmOtkCyn0XYS4tdYxoKjM="
},
"aarch64-linux": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.70.arm64.tar.gz",
"hash": "sha256-Uz8YKlIa6zibRv3ObnVVlyEk3sZP5wX+0E/nX02m6SA="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.72.arm64.tar.gz",
"hash": "sha256-GLDmBiIXGRQVy7wjW/52gIx97E6Q+A3wJwOGQvW29p8="
},
"x86_64-darwin": {
"url": "https://downloads.1password.com/mac/1Password-8.10.70-x86_64.zip",
"hash": "sha256-s6+LUSHZwCH5PgREt2bkCCR3JeGBj9llQ6rGrOhEPlQ="
"url": "https://downloads.1password.com/mac/1Password-8.10.72-x86_64.zip",
"hash": "sha256-SijXMG33quuxip2JOkjyB9ITSm9livqXzBPbqMmLVns="
},
"aarch64-darwin": {
"url": "https://downloads.1password.com/mac/1Password-8.10.70-aarch64.zip",
"hash": "sha256-f9b8L4S6CToMukeqrW3EKXAov0rqEMsIpZEGrvDQmg8="
"url": "https://downloads.1password.com/mac/1Password-8.10.72-aarch64.zip",
"hash": "sha256-y4kK4tL9NjvUT/C6q7WxaX/7LOCr3xkRJTBhqw2jjtQ="
}
},
"beta": {
pkgs/applications/misc/1password-gui/versions.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"stable-linux": "8.10.70",
"stable-darwin": "8.10.70",
"stable-linux": "8.10.72",
"stable-darwin": "8.10.72",
"beta-linux":"8.10.70-24.BETA",
"beta-darwin": "8.10.70-24.BETA"
}
pkgs/by-name/as/asusctl/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "asusctl";
version = "6.1.10";
version = "6.1.12";
src = fetchFromGitLab {
owner = "asus-linux";
repo = "asusctl";
rev = version;
hash = "sha256-KCGoaqqXWFApD464jbNcdGhd7DDxrpNcRg/ClM0GrJc=";
hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-c3uoQWdf4nG2SzLpB/T7AM/wrfxqVZcTVX1eRFZTGhQ=";
cargoHash = "sha256-lvm3xvI01RyaSS39nm3l7Zpn3x23DDBQr+0Gggl4p9U=";
postPatch = ''
files="
pkgs/by-name/ca/cargo-nextest/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
version = "0.9.93";
version = "0.9.94";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
hash = "sha256-MH3OPEap56GYT/84wlmDp7B/v45TgyW6KQLTJXHy5wI=";
hash = "sha256-r1Q4/CQwu4FRiymKacmg9SfM/sqagtzNF904TbjaB4c=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-7Re6TcHYhwFp4cj/KzJXpL0taH6X/S63lgAW5rtSrZk=";
cargoHash = "sha256-OXxmJcARh94lYxlRgv1fCCifYJwrWaQ21UxRNWI2yFw=";
cargoBuildFlags = [
"-p"
pkgs/by-name/cl/clickhouse-backup/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.6.13";
version = "2.6.15";
src = fetchFromGitHub {
owner = "Altinity";
repo = "clickhouse-backup";
rev = "v${version}";
hash = "sha256-8yvhDpSOklkWIi10o0QBd8bUB9qOF+nDhgaOD8G5FqU=";
hash = "sha256-WHIrgKWO8yHHbQ5i3qvCYjxuRPj8sRasjxQ2J1N8q7o=";
};
vendorHash = "sha256-4qPZihOuaD8lKF31fhyTDG7gBa0gExLVavazGZWDyAk=";
pkgs/by-name/co/cotp/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "cotp";
version = "1.9.2";
version = "1.9.4";
src = fetchFromGitHub {
owner = "replydev";
repo = "cotp";
rev = "v${version}";
hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs=";
hash = "sha256-O9qss8vxsGyBWaCTt3trjnFVol5ib/G7IZIj742A/XI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-6VdlXQymOFZgMksGRQ7f9ZGrzKblYlQAoBFUhi4wuM0=";
cargoHash = "sha256-Y8kGOeDKjdG+5zuA1mDx4h5IbKETjZU+SiFWiUv3xkw=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ];
pkgs/by-name/fi/files-cli/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.13.266";
version = "2.13.278";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-96DSnobVyG50iS6NyCMpZ74KWEtkCyNdFyGXLwrSZxo=";
hash = "sha256-/488GRkU3pQDEkQhLoKQ4ohv4olSnCaLAca/jvq/lsA=";
};
vendorHash = "sha256-ilof8neXlw2Oa3OVceiRbXBkj5nfw+b6VMjMWhPgJqI=";
vendorHash = "sha256-QulVxCaPvXlFwkxe15Et1+rReolABBssTxZspV8KzMs=";
ldflags = [
"-s"
pkgs/by-name/fr/frida-tools/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
python3Packages.buildPythonApplication rec {
pname = "frida-tools";
version = "13.6.1";
version = "13.7.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA=";
hash = "sha256-c0Gq1ep75WAvTGIj4c7xSy0NjCGK5wrRPYzeYyFHDgU=";
};
propagatedBuildInputs = with python3Packages; [
pkgs/by-name/mi/microsoft-edge/package.nix
+2 -2
View File
@@ -174,11 +174,11 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "134.0.3124.95";
version = "135.0.3179.54";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-vgTJl9BmMdm4Aw1FCpIfqzfmgsLuY61G/RSkA66kPhI=";
hash = "sha256-AppUIXOFouGRxMM6ioZq0cglKkNh811n+36z5yvVAuc=";
};
# With strictDeps on, some shebangs were not being patched correctly
pkgs/by-name/qu/quisk/package.nix
+2 -2
View File
@@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "quisk";
version = "4.2.41";
version = "4.2.42";
src = fetchPypi {
inherit pname version;
hash = "sha256-du6VcKn5WvLnlUrW9tKWT7MlMIZ2bpkrsO4yHC8cM6Q=";
hash = "sha256-Di5B0irH6G8XQtwXVDk4FXwLRo5Nh+cyt9zsG7+dMkc=";
};
buildInputs = [
pkgs/by-name/re/release-plz/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "release-plz";
version = "0.3.130";
version = "0.3.132";
src = fetchFromGitHub {
owner = "MarcoIeni";
repo = "release-plz";
rev = "release-plz-v${version}";
hash = "sha256-ulxKOlUn2FjdKOxBLHzRwaANijO4K2sgGZAUOPIqAl0=";
hash = "sha256-J2ViqVJEBGBiKfG9S7/p5RNjFNNp0A6b3Htv5c0On6M=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-pQErY/kUn9N+rVJZdHMCF74EKr9HOcHgqeBpKdmoHfQ=";
cargoHash = "sha256-z67GXNJ9QSRIafTCeVjr0T+EYdcT/Blr7pBGQJgobdc=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/sn/snakemake/package.nix
+28 -5
View File
@@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "8.29.2";
version = "9.1.10";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake";
tag = "v${version}";
hash = "sha256-69NsbfHF29l92gwO8If9vp8Cdjac3BnO+hbY3b2bZ8E=";
hash = "sha256-saEfclp6cRcBBUv/ssszr9Q8PGPapkSsjDwTUP9XOhg=";
};
postPatch = ''
@@ -25,13 +25,13 @@ python3Packages.buildPythonApplication rec {
substituteInPlace tests/common.py \
--replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \
--replace-fail 'del os.environ["PYTHONPATH"]' "pass"
substituteInPlace snakemake/unit_tests/__init__.py \
substituteInPlace src/snakemake/unit_tests/__init__.py \
--replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"'
substituteInPlace snakemake/assets/__init__.py \
substituteInPlace src/snakemake/assets/__init__.py \
--replace-fail "raise err" "return bytes('err','ascii')"
'';
build-system = with python3Packages; [ setuptools ];
build-system = with python3Packages; [ setuptools-scm ];
dependencies = with python3Packages; [
appdirs
@@ -55,6 +55,7 @@ python3Packages.buildPythonApplication rec {
smart-open
snakemake-interface-executor-plugins
snakemake-interface-common
snakemake-interface-logger-plugins
snakemake-interface-storage-plugins
snakemake-interface-report-plugins
stopit
@@ -126,6 +127,20 @@ python3Packages.buildPythonApplication rec {
"test_deploy_sources"
"test_output_file_cache_storage"
"test_storage"
# Tries to access internet
"test_report_after_run"
# Needs stress-ng
"test_benchmark"
"test_benchmark_jsonl"
# Needs unshare
"test_nodelocal"
# Requires snakemake-storage-plugin-http
"test_keep_local"
"test_retrieve"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Unclear failure:
@@ -144,6 +159,14 @@ python3Packages.buildPythonApplication rec {
"test_queue_input_forceall"
"test_resources_submitted_to_cluster"
"test_scopes_submitted_to_cluster"
# Issue with /dev/stderr in sandbox
"test_protected_symlink_output"
# Unclear issue:
# pulp.apis.core.PulpSolverError: Pulp: cannot execute cbc cwd:
# but pulp solver is not default
"test_access_patterns"
];
pythonImportsCheck = [ "snakemake" ];
pkgs/by-name/we/weblate/package.nix
+5
View File
@@ -152,6 +152,11 @@ python.pkgs.buildPythonApplication rec {
postgres = with python.pkgs; [ psycopg ];
};
pythonRelaxDeps = [
"celery"
"rapidfuzz"
];
# We don't just use wrapGAppsNoGuiHook because we need to expose GI_TYPELIB_PATH
GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [
pango
pkgs/by-name/ya/yazi/plugins/piper/default.nix
+23
View File
@@ -0,0 +1,23 @@
{
lib,
fetchFromGitHub,
mkYaziPlugin,
}:
mkYaziPlugin {
pname = "piper.yazi";
version = "25.4.8-unstable-2025-04-13";
src = fetchFromGitHub {
owner = "yazi-rs";
repo = "plugins";
rev = "b12a9ab085a8c2fe2b921e1547ee667b714185f9";
hash = "sha256-LWN0riaUazQl3llTNNUMktG+7GLAHaG/IxNj1gFhDRE=";
};
meta = {
description = "Pipe any shell command as a previewer";
homepage = "https://yazi-rs.github.io";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ khaneliman ];
};
}
pkgs/development/python-modules/pytest-repeat/default.nix
+3 -6
View File
@@ -6,23 +6,20 @@
hatch-vcs,
pytest,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "pytest-repeat";
version = "0.9.3";
version = "0.9.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pytest_repeat";
inherit version;
hash = "sha256-/9ODbfzWe7JwvsZIszDiC+N9KWZEjEFIxAktHoq6gYU=";
hash = "sha256-2SrBTfqm/8/mkX5dFvDJvII4DBNbA8Kl9BLSY38iRIU=";
};
nativeBuildInputs = [
build-system = [
hatchling
hatch-vcs
];
pkgs/development/python-modules/snakemake-interface-logger-plugins/default.nix
+35
View File
@@ -0,0 +1,35 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
hatchling,
snakemake-interface-common,
}:
buildPythonPackage rec {
pname = "snakemake-interface-logger-plugins";
version = "1.2.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
tag = "v${version}";
hash = "sha256-VHbta+R2a/K2L03IRu/Ya7dJzshIAvyK9cNIRbx8QqM=";
};
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
snakemake-interface-common
];
pythonImportsCheck = [ "snakemake_interface_logger_plugins" ];
meta = with lib; {
description = "A stable interface for interactions between Snakemake and its logger plugins";
homepage = "https://github.com/snakemake/snakemake-interface-logger-plugins";
license = licenses.mit;
maintainers = with maintainers; [ veprbl ];
};
}
pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+4 -2
View File
@@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
poetry-core,
humanfriendly,
reretry,
snakemake-interface-common,
throttler,
@@ -11,19 +12,20 @@
buildPythonPackage rec {
pname = "snakemake-interface-storage-plugins";
version = "3.3.0";
version = "4.2.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
tag = "v${version}";
hash = "sha256-qjQZc7DIXIPmqXq+Fjslgrq2LbjbdRS/twGsp/jrxRY=";
hash = "sha256-mGpKmKWWL4ue9Dddjs4fXCaITrC97yHC58Jh2vclXAY=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
humanfriendly
reretry
snakemake-interface-common
throttler
pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "snakemake-storage-plugin-fs";
version = "1.0.6";
version = "1.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
tag = "v${version}";
hash = "sha256-9A2W+V0d9K1Ei4WXqIZfIcOYsWgpGVP7P/ANy8jOGu0=";
hash = "sha256-Y+Fofz4D/CWgdG3lOneadRu/VfJ23D4Dz751j9rUKNo=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/snakemake-storage-plugin-s3/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "snakemake-storage-plugin-s3";
version = "0.3.1";
version = "0.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-storage-plugin-s3";
tag = "v${version}";
hash = "sha256-WbGlXu6/7e9U2GfVd4IF86bRfulNxjP1Tw5pVHpEj/g=";
hash = "sha256-jIz8Stx2Abd+xGx6kEwlgq3KGsFO13Lk2N8eLB8marA=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix
+8 -4
View File
@@ -2,7 +2,8 @@
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
hatch-vcs,
hatchling,
snakemake,
snakemake-interface-storage-plugins,
snakemake-interface-common,
@@ -11,20 +12,23 @@
buildPythonPackage rec {
pname = "snakemake-storage-plugin-xrootd";
version = "0.1.4";
version = "0.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
tag = "v${version}";
hash = "sha256-1plBss9jRzIIGQE7rXDEnAomFxNzSUKsw0VyhYA2mIc=";
hash = "sha256-vfMAgOTmT3uzUZHXeKsd8Ze3+b3nFsVHDhkPG+xvz+k=";
};
# xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303
pythonRelaxDeps = [ "xrootd" ];
build-system = [ poetry-core ];
build-system = [
hatch-vcs
hatchling
];
dependencies = [
snakemake-interface-storage-plugins
pkgs/top-level/python-packages.nix
+4
View File
@@ -15968,6 +15968,10 @@ self: super: with self; {
callPackage ../development/python-modules/snakemake-interface-executor-plugins
{ };
snakemake-interface-logger-plugins =
callPackage ../development/python-modules/snakemake-interface-logger-plugins
{ };
snakemake-interface-report-plugins =
callPackage ../development/python-modules/snakemake-interface-report-plugins
{ };