nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-24.11 into staging-24.11

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-08 00:18:19 +00:00
committed by GitHub
parent e2d2c86df7 3ed67d7697
commit ced3989684
20 changed files with 3282 additions and 3156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/backport.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

4
.github/workflows/codeowners-v2.yml vendored
View File

@@ -63,7 +63,7 @@ jobs:
- name: Build codeowners validator
run: nix-build base/ci -A codeownersValidator
- uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
id: app-token
with:
app-id: ${{ vars.OWNER_RO_APP_ID }}
@@ -96,7 +96,7 @@ jobs:
# This is intentional, because we need to request the review of owners as declared in the base branch.
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}

2
.github/workflows/eval.yml vendored
View File

@@ -244,7 +244,7 @@ jobs:
steps:
# See ./codeowners-v2.yml, reuse the same App because we need the same permissions
# Can't use the token received from permissions above, because it can't get enough permissions
- uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}

2
.github/workflows/periodic-merge.yml vendored
View File

@@ -19,7 +19,7 @@ jobs:
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@af35edadc00be37caa72ed9f3e6d5f7801bfdf09 # v1.11.7
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

12
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@@ -1,8 +1,8 @@
{
x86_64-linux = "/nix/store/00a7rdfwhm6avqkgj68grddbzyz3h6ql-nix-2.24.13";
i686-linux = "/nix/store/s6c620v60hfishzi1lbfpryk65lbvg8g-nix-2.24.13";
aarch64-linux = "/nix/store/7yg9is1shh3383iwi6qynz3vh91l1f9d-nix-2.24.13";
riscv64-linux = "/nix/store/fagjkrx5r6p52xp8qb5581bmnlgp01sn-nix-riscv64-unknown-linux-gnu-2.24.13";
x86_64-darwin = "/nix/store/ifby7rrgkkly5pzjnyac90lzvrak3i9y-nix-2.24.13";
aarch64-darwin = "/nix/store/b0rbdp6ba2fprprpgsw1a8pplzg0j324-nix-2.24.13";
x86_64-linux = "/nix/store/kvqnqgjw3k0xmv3ypzajz3c5wf1pxnbs-nix-2.24.14";
i686-linux = "/nix/store/292xy9z1vjmy0888bzadmj9fmq1ccapv-nix-2.24.14";
aarch64-linux = "/nix/store/qsy62z6rk31s8s937nvkcdhn0ds62yax-nix-2.24.14";
riscv64-linux = "/nix/store/zvrzwzv534zcmhw4ai1hbc4iz229hk3p-nix-riscv64-unknown-linux-gnu-2.24.14";
x86_64-darwin = "/nix/store/jc7x6906wyy6csgf6br1gbwkw56nxm4l-nix-2.24.14";
aarch64-darwin = "/nix/store/sfrmn30fijs6qpfi7ckjkv2vdr4z590h-nix-2.24.14";
}

10
pkgs/applications/networking/browsers/librewolf/src.json
View File

@@ -1,11 +1,11 @@
{
"packageVersion": "136.0.4-1",
"packageVersion": "137.0-3",
"source": {
"rev": "136.0.4-1",
"hash": "sha256-ymW9vj4CariMaswrMQRKYEvTofFRjc50gF9EmTuhsRA="
"rev": "137.0-3",
"hash": "sha256-3E8xjruyAHoOklvSt4sH6DY6cIzcOEFy8v3UhqKSpdI="
},
"firefox": {
"version": "136.0.4",
"hash": "sha512-wiUqpi0BXO1lNMsqwHH2gImZe0ZpAIPMHv9LrTBq5shlQ3Ge0tNfb5c790Rn1qBKukYNMJwG3qQl52xyDjROKA=="
"version": "137.0",
"hash": "sha512-gaLAzBT/wuSeSTeebCq1bPtuE7ZmZqZPOr/0SkO7Ln3BcnTTJdHCCvBi1Av/gGPXiNSy+TGnpkbbiwcgTKa0gQ=="
}
}

116
pkgs/by-name/bu/buildstream/package.nix Normal file
View File

@@ -0,0 +1,116 @@
{
lib,
python3Packages,
fetchFromGitHub,
# buildInputs
buildbox,
fuse3,
lzip,
patch,
# tests
addBinToPathHook,
gitMinimal,
versionCheckHook,
}:
python3Packages.buildPythonApplication rec {
pname = "buildstream";
version = "2.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "apache";
repo = "buildstream";
tag = version;
hash = "sha256-6a0VzYO5yj7EHvAb0xa4xZ0dgBKjFcwKv2F4o93oahY=";
};
build-system = with python3Packages; [
cython
pdm-pep517
setuptools
setuptools-scm
];
dependencies = with python3Packages; [
click
dulwich
grpcio
jinja2
markupsafe
packaging
pluginbase
protobuf
psutil
pyroaring
requests
ruamel-yaml
ruamel-yaml-clib
tomlkit
ujson
];
buildInputs = [
buildbox
fuse3
lzip
patch
];
pythonImportsCheck = [ "buildstream" ];
nativeCheckInputs = [
addBinToPathHook
buildbox
gitMinimal
python3Packages.pexpect
python3Packages.pyftpdlib
python3Packages.pytest-datafiles
python3Packages.pytest-env
python3Packages.pytest-timeout
python3Packages.pytest-xdist
python3Packages.pytestCheckHook
versionCheckHook
];
disabledTests = [
# ValueError: Unexpected comparison between all and ''
"test_help"
# Error loading project: project.conf [line 37 column 2]: Failed to load source-mirror plugin 'mirror': No package metadata was found for sample-plugins
"test_source_mirror_plugin"
# AssertionError: assert '1a5528cad211...0bbe5ee314c14' == '2ccfee62a657...52dbc47203a88'
"test_fixed_cas_import"
"test_random_cas_import"
# Runtime error: The FUSE stager child process unexpectedly died with exit code 2
"test_patch_sources_cached_1"
"test_patch_sources_cached_2"
"test_source_cache_key"
"test_custom_transform_source"
# Blob not found in the local CAS
"test_source_pull_partial_fallback_fetch"
];
disabledTestPaths = [
# FileNotFoundError: [Errno 2] No such file or directory: '/build/source/tmp/popen-gw1/test_report_when_cascache_exit0/buildbox-casd'
"tests/internals/cascache.py"
];
versionCheckProgram = "${placeholder "out"}/bin/bst";
versionCheckProgramArg = "--version";
meta = {
description = "Powerful software integration tool";
downloadPage = "https://buildstream.build/install.html";
homepage = "https://buildstream.build";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
mainProgram = "bst";
maintainers = with lib.maintainers; [ shymega ];
};
}

38
pkgs/by-name/pr/pretix/plugins/dbvat.nix Normal file
View File

@@ -0,0 +1,38 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pretix-plugin-build,
setuptools,
}:
buildPythonPackage rec {
pname = "pretix-dbvat";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-dbvat";
rev = "v${version}";
hash = "sha256-yAKqB0G2WyGqGogAxv8fI34gO6Wl/50sY/5rvWYH4Ho=";
};
build-system = [
pretix-plugin-build
setuptools
];
doCheck = false; # no tests
pythonImportsCheck = [
"pretix_dbvat"
];
meta = with lib; {
description = "Plugin for using Deutsche Bahn (DB) Event Discount (Veranstaltungsrabatt)";
homepage = "https://github.com/pretix/pretix-dbvat";
license = licenses.asl20;
maintainers = with maintainers; [ e1mo ];
};
}

2
pkgs/by-name/pr/pretix/plugins/default.nix
View File

@@ -4,6 +4,8 @@
}:
{
dbvat = callPackage ./dbvat.nix { };
pages = callPackage ./pages.nix { };
passbook = callPackage ./passbook.nix { };

12
pkgs/by-name/qq/qq/sources.nix
View File

@@ -1,9 +1,9 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2025-03-10
# Last updated: 2025-03-24
{
version = "3.2.16-2025.3.7";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250307_arm64_01.deb";
arm64_hash = "sha256-ZzrG0rkwtgJ9YnA+WsrLqN93fwFx0u5SGJcnNw+H4qM=";
amd64_hash = "sha256-TyfWhVeQm7ghe1Li4PvNiZ/X1JAdaZYcWv/fnChawBU=";
version = "3.2.16-2025.3.18";
amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_amd64_01.deb";
arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.16_250318_arm64_01.deb";
arm64_hash = "sha256-j3aMjxfKyV/IpwxxchMrakJ9ZauA43WwZ9ysoZMEPyE=";
amd64_hash = "sha256-JaTsTL8j0KyACSm1mp9O+l526165+qheJUtTxMH4Tgg=";
}

4
pkgs/by-name/ru/rundeck/package.nix
View File

@@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rundeck";
version = "5.9.0-20250205";
version = "5.10.0-20250312";
src = fetchurl {
url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
hash = "sha256-3FDZJMw/ix54mSrMZ56CxibTjnI+6NxmjmKn59TAWtI=";
hash = "sha256-BwO7FM1LP0OrjG7opz4qqDuJQdtBmmFtZTtigV99ssE=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/by-name/sm/smartgithg/package.nix
View File

@@ -16,13 +16,13 @@ let
in
stdenv.mkDerivation rec {
pname = "smartgithg";
version = "23.1.3";
version = "23.1.5";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
url = "https://www.syntevo.com/downloads/smartgit/archive/smartgit-linux-${
builtins.replaceStrings [ "." ] [ "_" ] version
}.tar.gz";
hash = "sha256-UvdHr1L5MYwl7eT1BVS/M8Ydtw8VjDG+QuqMW0Q5La4=";
hash = "sha256-OYmiDbmhUBWte27xn6LVEI+DrcOkqYOPnS8omswLfH8=";
};
nativeBuildInputs = [ wrapGAppsHook3 ];

42
pkgs/development/python-modules/pyroaring/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
cython,
setuptools,
hypothesis,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pyroaring";
version = "1.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Ezibenroc";
repo = "PyRoaringBitMap";
tag = version;
hash = "sha256-pnANvqyQ5DpG4NWSgWkAkXvSNLO67nfa97nEz3fYf1Y=";
};
build-system = [
cython
setuptools
];
pythonImportsCheck = [ "pyroaring" ];
nativeCheckInputs = [
hypothesis
pytestCheckHook
];
meta = {
description = "Python library for handling efficiently sorted integer sets";
homepage = "https://github.com/Ezibenroc/PyRoaringBitMap";
changelog = "https://github.com/Ezibenroc/PyRoaringBitMap/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ];
};
}

4
pkgs/development/tools/pnpm/default.nix
View File

@@ -16,8 +16,8 @@ let
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
};
"10" = {
version = "10.7.1";
hash = "sha256-3FFIkOpxkAPLelfWshryT9r63Z8XHnVn7KFmXXz873Y=";
version = "10.8.0";
hash = "sha256-Kb8sXOrqeZHugu7BX+cWLg+tgW0MSms1oWwB05J0v2k=";
};
};

24
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -1,11 +1,11 @@
{
"testing": {
"version": "6.14-rc7",
"hash": "sha256:0bw3xip9qg4zr42vx28iai954g5a1wprrrkr81zn7x7vv3ayjvya"
"version": "6.15-rc1",
"hash": "sha256:0kp35q86jihknj5y6f1zspfkhqx0c0npkk3is8p0gf2r3y302cp9"
},
"6.1": {
"version": "6.1.132",
"hash": "sha256:1l5vrc8an6h0fcnfmqb6pmal686imxbllcvlkqah19fg7wnv3dyx"
"version": "6.1.133",
"hash": "sha256:0w5yb9y0jxrqh1wyajs33mpkcix4752acwra8jbg498r7yprzdcp"
},
"5.15": {
"version": "5.15.179",
@@ -20,19 +20,19 @@
"hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk"
},
"6.6": {
"version": "6.6.85",
"hash": "sha256:0abmgc5rg7hx18ykwsl6xl72gzaf3wbn5bkvh4kcsa1lrbscrfjy"
"version": "6.6.86",
"hash": "sha256:0s1yy429g70iry559hsfv3plf787bik3kkd0mpx3a1z44dsavqs9"
},
"6.12": {
"version": "6.12.21",
"hash": "sha256:1iyn8qif6xfz04z698ib2dvmam54pyxzsign8sbdj9505sdf66lx"
"version": "6.12.22",
"hash": "sha256:0dkk6d9ml44q2kr7wd8px8iy3lwgyb2qmbhq4f6sg1crnh580j5b"
},
"6.13": {
"version": "6.13.9",
"hash": "sha256:1ci78x5dfjm3nlv4m2j02wl7ax82l47xwnr4k6j9n4dn53qa7rsk"
"version": "6.13.10",
"hash": "sha256:08kpzbysnabyjn76nk8f3zqxlsw45wkhw5vafrgr43vj3v1zrwjp"
},
"6.14": {
"version": "6.14",
"hash": "sha256:0w3nqh02vl8f2wsx3fmsvw1pdsnjs5zfqcmv2w2vnqdiwy1vd552"
"version": "6.14.1",
"hash": "sha256:01z4cf2aivg0bs1i874kqldwxsspg53wvkyfy2nlzmlzhz8j5wav"
}
}

4
pkgs/servers/mastodon/source.nix
View File

@@ -5,14 +5,14 @@
patches ? [ ],
}:
let
version = "4.3.6";
version = "4.3.7";
in
(applyPatches {
src = fetchFromGitHub {
owner = "mastodon";
repo = "mastodon";
rev = "v${version}";
hash = "sha256-cTJmSrQ+xlDfrAyHKeiIvrUOgAh9DQT2NNizN8XT3P0=";
hash = "sha256-KmeWBMuyJ/ZdZnFXAlpvgXV+J8IZrcaTXvvui4l6mjY=";
};
patches = patches ++ [ ./downgrade-bundler-version.patch ];
})

9
pkgs/tools/admin/pgadmin/default.nix
View File

@@ -16,14 +16,14 @@
let
pname = "pgadmin";
version = "8.12";
yarnHash = "sha256-C5CI8oP9vEana3OEs1yAsSSTvO2uLEuCU1nHhC7LerY=";
version = "9.2";
yarnHash = "sha256-nFYzaMRASkorEJC5UgLZjDY99ptwPqOMxOomhY/CY5k=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-OIFHaU+Ty0xJn42iqYhse8dfFJZpx8AV/10RNxp1Y4o=";
hash = "sha256-2Hl9YpXXlfkD0KOEV0dD0Ib1QlwyY3tXm56sDyvafKE=";
};
# keep the scope, as it is used throughout the derivation and tests
@@ -78,7 +78,7 @@ pythonPackages.buildPythonApplication rec {
sed 's|*|0|g' -i requirements.txt
# remove packageManager from package.json so we can work without corepack
substituteInPlace web/package.json \
--replace-fail "\"packageManager\": \"yarn@3.8.3\"" "\"\": \"\""
--replace-fail "\"packageManager\": \"yarn@3.8.7\"" "\"\": \"\""
substituteInPlace pkg/pip/setup_pip.py \
--replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
${lib.optionalString (!server-mode) ''
@@ -196,7 +196,6 @@ pythonPackages.buildPythonApplication rec {
azure-identity
sphinxcontrib-youtube
dnspython
greenlet
speaklater3
google-auth-oauthlib
google-api-python-client

6139
pkgs/tools/admin/pgadmin/yarn.lock
View File

File diff suppressed because it is too large Load Diff

4
pkgs/tools/package-management/nix/default.nix
View File

@@ -291,8 +291,8 @@ lib.makeExtensible (
};
nix_2_24 = common {
version = "2.24.13";
hash = "sha256-lUsK8lAwaaTEM+KFML/6sYwaVAiSf70g1EfSDJNNrU0=";
version = "2.24.14";
hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
self_attribute_name = "nix_2_24";
};

2
pkgs/top-level/python-packages.nix
View File

@@ -12485,6 +12485,8 @@ self: super: with self; {
pyro5 = callPackage ../development/python-modules/pyro5 { };
pyroaring = callPackage ../development/python-modules/pyroaring { };
pyrogram = callPackage ../development/python-modules/pyrogram { };
pyroma = callPackage ../development/python-modules/pyroma { };