mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
@@ -34,6 +34,13 @@ In order to do so, add yourself to the [`maintainer-list.nix`](./maintainer-list
|
||||
If you're adding yourself as a maintainer as part of another PR (in which you become a maintainer of a package, for example), make your change to
|
||||
`maintainer-list.nix` in a separate commit titled `maintainers: add <handle>`.
|
||||
|
||||
Once the PR is merged you will automatically get invited to join the [NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers) GitHub team.
|
||||
By joining, we will be able to ping you for review, and you will get some triaging rights in the nixpkgs repository, like the ability to close and reopen issues made by others and managing labels, as well as invoke the merge bot on eligible PRs.
|
||||
|
||||
> [!NOTE]
|
||||
> The automatic GitHub team invite is usually only sent by email, and is only valid for one week!
|
||||
> Should it expire, please request a new one by following the instructions [here](https://github.com/NixOS/rfc39-record/blob/main/README.md#requesting-a-new-invitation).
|
||||
|
||||
### Losing maintainer status
|
||||
|
||||
Maintainers who have become inactive can be removed.
|
||||
@@ -54,11 +61,6 @@ This process is subject to error however, so we encourage PR authors to notify t
|
||||
Maintainers can also invoke the [nixpkgs-merge-bot](../ci/README.md#nixpkgs-merge-bot) to merge pull requests targeting packages they are the maintainer of, which satisfy the current security [constraints](../ci/README.md#merge-bot-constraints).
|
||||
Examples: [#397273](https://github.com/NixOS/nixpkgs/pull/397273#issuecomment-2789382120) and [#377027](https://github.com/NixOS/nixpkgs/pull/377027#issuecomment-2614510869)
|
||||
|
||||
New maintainers will automatically get invited to join the [NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers) GitHub team.
|
||||
By joining, you will get some triaging rights in the nixpkgs repository, like the ability to close and reopen issues made by others, and managing labels.
|
||||
However, the GitHub team invite is usually only sent by email, and is only valid for one week!
|
||||
Should it expire, please request a new one by following the instructions [here](https://github.com/NixOS/rfc39-record/blob/main/README.md).
|
||||
|
||||
### Unofficial maintainer tooling
|
||||
|
||||
[zh.fail](https://zh.fail/failed/overview.html) tracks all package build failures on `master` grouped by maintainer.
|
||||
|
||||
@@ -11744,6 +11744,12 @@
|
||||
githubId = 157678;
|
||||
keys = [ { fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; } ];
|
||||
};
|
||||
irgendeinwer = {
|
||||
name = "Irgendeinwer";
|
||||
email = "irgendeinwer@proton.me";
|
||||
github = "Irgendeinwer";
|
||||
githubId = 175053643;
|
||||
};
|
||||
ironicbadger = {
|
||||
email = "alexktz@gmail.com";
|
||||
github = "ironicbadger";
|
||||
|
||||
@@ -341,6 +341,7 @@ in
|
||||
APP_URL = cfg.appURL;
|
||||
DB_HOST = db.host;
|
||||
DB_PORT = db.port;
|
||||
DB_SOCKET = lib.mkIf db.createLocally "/run/mysqld/mysqld.sock";
|
||||
DB_DATABASE = db.name;
|
||||
DB_USERNAME = db.user;
|
||||
DB_PASSWORD._secret = db.passwordFile;
|
||||
|
||||
@@ -98,8 +98,8 @@ rec {
|
||||
thunderbird-153 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "153.1.0esr";
|
||||
sha512 = "3d6c82e1489b906e6cf73c3eeb7d7e23de6901a75c704176b996d183a889f24275214999155992789a57a713e6cd073e2752120c3b281136ed34f36f289fbcb4";
|
||||
version = "153.1.1esr";
|
||||
sha512 = "a0e26fb0c4c6c97ab2cc0dca0f122de9f149e70ed888010dd79192f838caa267b80bdc9e33fdcd9d8cbb3efd7ac8c63ca5b36058a5c40fe1e9f638387e7f20de";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-153";
|
||||
|
||||
100
pkgs/by-name/an/android-mic/package.nix
Normal file
100
pkgs/by-name/an/android-mic/package.nix
Normal file
@@ -0,0 +1,100 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
rustPlatform,
|
||||
libcosmicAppHook,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
just,
|
||||
alsa-lib,
|
||||
libjack2,
|
||||
pipewire,
|
||||
android-tools,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
rnnoiseModel = fetchurl {
|
||||
url = "https://media.xiph.org/rnnoise/models/rnnoise_data-0a8755f8e2d834eff6a54714ecc7d75f9932e845df35f8b59bc52a7cfe6e8b37.tar.gz";
|
||||
hash = "sha256-CodV+OLYNO/2pUcU7MfXX5ky6EXfNfi1m8UqfP5uizc=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "android-mic";
|
||||
version = "2.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "teamclouday";
|
||||
repo = "AndroidMic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YhkHK795WeRaGUIaBNWNAkaL836muFRZAZRmP0FEC6g=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/RustApp";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile \
|
||||
--replace-fail '`git rev-parse --short HEAD`' '"${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-Ar7kdIXl/2H3c83x7uw977PwShYqV4e2O9HXEeiZeAM=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
rustPlatform.bindgenHook
|
||||
pkg-config
|
||||
protobuf
|
||||
just
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libjack2
|
||||
pipewire
|
||||
];
|
||||
|
||||
env = {
|
||||
PROTOC = lib.getExe protobuf;
|
||||
ANDROID_MIC_COMMIT = finalAttrs.version;
|
||||
RNNOISE_MODEL_PATH = "${rnnoiseModel}";
|
||||
};
|
||||
|
||||
dontUseJustBuild = true;
|
||||
dontUseJustCheck = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"cargo-target-dir"
|
||||
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ android-tools ]})
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Use your Android phone as a microphone for your PC";
|
||||
homepage = "https://github.com/teamclouday/AndroidMic";
|
||||
changelog = "https://github.com/teamclouday/AndroidMic/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ irgendeinwer ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "android-mic";
|
||||
};
|
||||
})
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ant";
|
||||
version = "1.10.17";
|
||||
version = "1.10.18";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/ant/binaries/apache-ant-${finalAttrs.version}-bin.tar.bz2";
|
||||
hash = "sha256-UhD8nXfpa/X0Y5KH8pgm2oXlSlQuCkCUY7FkK8PKruc=";
|
||||
hash = "sha256-vBK+cMtcGwdMHnPYKj89pV88ZbigxzQqbrbR0CQmUoA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
|
||||
platforms
|
||||
;
|
||||
|
||||
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.3");
|
||||
broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.4");
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
rustc,
|
||||
rustPlatform,
|
||||
rust-bindgen,
|
||||
jq,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
@@ -31,18 +32,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.39.2";
|
||||
version = "1.39.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1ilzebplgFVaqiSzpTeGRgnSqYfo9W8G7xj/6KlX990=";
|
||||
hash = "sha256-cnSlmUH+1odSO1knyrXrWUf7EjY9U4n2IlxVKMczB3Y=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-g3r99wa4S0ZVUvTSYo4PTzOswjsOn83hkocoziHcn2A=";
|
||||
hash = "sha256-Jpl4SBSX9M45zFHpckNHMdZGA5y00YfhrPwmZabWj3Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.bindgenHook
|
||||
rust-bindgen
|
||||
jq
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
@@ -101,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env = {
|
||||
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMGENERATORDIR = "${placeholder "out"}/lib/systemd/system-generators";
|
||||
};
|
||||
|
||||
# Workaround for RISCV cross-compilation issue
|
||||
|
||||
@@ -55,13 +55,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolphin-emu";
|
||||
version = "2603a";
|
||||
version = "2606a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+3/JtjKFsTEkKQa0LjycqNmDz0M8o2FndWQtw5R5/jQ=";
|
||||
hash = "sha256-TAIxBEGbbYvoOi+dukr2Hij0J/NL9Iy6pcgf2bhEgI8=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "edhm-ui";
|
||||
version = "3.0.70";
|
||||
version = "3.0.71";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip";
|
||||
hash = "sha256-jAvUWrjQl8dmXxd99ONYqgdnPkzDQwdSEf8ar2nLEds=";
|
||||
hash = "sha256-wMsP2VeSbo78II/tT5nBAvOIQc3lCBqy+l0F2r3ulEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eggdrop";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor finalAttrs.version}/eggdrop-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-pc33RE14HC/09dC+FCAvXQlx4AOHGBpJtyUFf+lTEtU=";
|
||||
hash = "sha256-1mRrYwh54azZsFP/oS9GZn+QcUXymvHfD4J0nvMDKpQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
version = "1.37.4";
|
||||
version = "1.37.6";
|
||||
inherit (stdenvNoCC.hostPlatform) system;
|
||||
throwSystem = throw "envoy-bin is not available for ${system}.";
|
||||
|
||||
@@ -20,8 +20,8 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-y5WLtcHpEkYoPHOcCPDpE+d5nJd5Hn26G6znsd6ljuA=";
|
||||
x86_64-linux = "sha256-i8e/dn5revJhxLboUYk1bzC8fmx4ERnp2RHfHXRfgKg=";
|
||||
aarch64-linux = "sha256-dX/hh6gIPwNF6x7q5pS3+09b54sAVCxCy4SfWhaMSBg=";
|
||||
x86_64-linux = "sha256-gQWRigH5aMbPx9EIk4xQgEYuKRMyrxeB0NEUtqBk+U8=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
in
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.63.18";
|
||||
version = "2.63.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0j0i6bKKbyUi4O0wBT+xYjvywjRzAGd0/13Yh/dG5GA=";
|
||||
hash = "sha256-G0TIQE+Rru4JWBJIi8kdxSaP0CDPo2DyWLmcU2AX7Fs=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -41,7 +41,7 @@ let
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
hash = "sha256-UwTA7Eogp2GrvmXDbdfGBTJS3DuOTJ42e6fHlQxSHoA=";
|
||||
hash = "sha256-XZdHaXnIfjA1wO6KQihj6PwXQ5LEcMrLRe2Md65nQ38=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -59,7 +59,7 @@ buildGoModule {
|
||||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-BXw+fURCh1qNlwWo49aXIpSM339bV3Gwn9Ov8HLEVF0=";
|
||||
vendorHash = "sha256-CuYi2PfR0F0lppFiRFzFj0yLms7VFNxzKpzlmEaCWWs=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "152.0.5-1";
|
||||
version = "155.0.1-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-9Y0n3UHRK9WgKhKFIMB3CLmh1Gp5aHoIiKxlKNKe5gc=";
|
||||
aarch64-linux = "sha256-x9vUXaEtjnY6+mOLbLiXmBr5c7ZmEYRTJK9fDIpfgVs=";
|
||||
x86_64-linux = "sha256-jbkbQ22263oWt8WBvsIsFGySwOZ6U2cXuguMrAUgbvE=";
|
||||
aarch64-linux = "sha256-zjhFSpe4baNl7vXxRkCm7upHXJ/RIwuHg5cUV1GkYSA=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.47.4";
|
||||
version = "1.47.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Qi1Bz5u/ZDupJz/9ueAwCnJ1hUWIpx1B32dGzcp87Fo=";
|
||||
hash = "sha256-IUz1BrwJnx+VXq89YbuN6kR7CzCZzkTOG1pQQ9+NpA4=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iw9ipn86SjXCdmC5W2naJvaSpYCYb6uNPkKVtA/ZMd4=";
|
||||
cargoHash = "sha256-r9YgTFIBa3HoKEpDH3SLqmXLLd5HNPCznf/mo1si2rw=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.159.0";
|
||||
version = "1.160.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Fdbr+uMKFTZl1ETyaDavsSCpJYwS5+eLqifMlLGtDeA=";
|
||||
hash = "sha256-sf7YS3AKPnhQySGZD1uvHvpVdUWIV/hrzBLvmbvS3bA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-9VmEej1AKvGMMgbdyvm0DFZJ9sLP2WcV29+xVtOLV4g=";
|
||||
hash = "sha256-154xfJLCCcPbjxknbm5HanJyMGnAJCTZKH8BYvMCvpo=";
|
||||
};
|
||||
|
||||
build-system =
|
||||
@@ -165,7 +165,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
meta = {
|
||||
homepage = "https://matrix.org";
|
||||
changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}";
|
||||
changelog = "https://github.com/element-hq/synapse/blob/v${version}/CHANGES.md";
|
||||
description = "Matrix reference homeserver";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ sumnerevans ];
|
||||
|
||||
@@ -49,13 +49,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.3.7";
|
||||
version = "2.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RK6eRKqZtyBDGRfrapAOwpnrEM9cq5qa0Ev958SOcII=";
|
||||
hash = "sha256-MW3DgW9bdWiucwiVQdVojlZ0Sl4Pd+l8SWkMGf929pQ=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
@@ -95,7 +95,7 @@ buildGoModule (finalAttrs: {
|
||||
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-QDWLeQfQOEGxU87PQLZaYQqrY2XyldJtRo59CMAiao8=";
|
||||
vendorHash = "sha256-NpGdVymENUkxW1N3BQGdVPGbp/snMOf22khQ6xEsNuk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -33,13 +33,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541";
|
||||
version = "1.4.17";
|
||||
version = "1.4.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541";
|
||||
repo = "open62541";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-EUQ/wXv1dON7MzOKmnyNUY0mTC64qUEF1++YzPC2xIo=";
|
||||
hash = "sha256-61NhpyI03gtNh0U/RbZvm9jYA79b20+2NLt1E9oU4fc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-wUT+sjz8LNR+vzNRMq6gr6tgWttP9PMJVb40RQNODe8=";
|
||||
hash = "sha256-1A3UngrHAaOwIZnq8VwWleOANTX8kOUbbbFJVip7npE=";
|
||||
};
|
||||
# redact configure flags from version output to reduce closure size
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-ci-broker";
|
||||
version = "0.31.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.dev";
|
||||
repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
|
||||
node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yY2ke4JBAn0ZTaZ7HV8GCPF5Yqj1j+7GvjFXQQVM3ME=";
|
||||
hash = "sha256-+NPlpDGrHjCB1ny81wbaM3f/b3wLFaH5ldINeTuV5hI=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+XB2+k18gWEO7tpsQK+ua133PcZ0mxV+txle7VutXIk=";
|
||||
cargoHash = "sha256-o0s6za+IxeJQkwHKuMPJk+uDcMp7VRq+mMqpX3bcWVY=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.rs \
|
||||
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
ln -s "$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType" target/debug
|
||||
export SUBPLOT_DIR="$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType"
|
||||
|
||||
rad auth --alias alice --stdin </dev/null
|
||||
'';
|
||||
|
||||
@@ -18,11 +18,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "Reposilite";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
|
||||
hash = "sha256-N7oGxGQHGwy6iflj6uiiJGCc5KpCZgIO7+QACiR2Fuc=";
|
||||
hash = "sha256-fJc8Et98svDcVtibcGSoVeJaLJl1qb1eO+2OxfeVqA8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"checksum": "sha256-vRRHaA05BHKs4fP+ono9UNSMi6O9WOO/pY/Rmh08+8A=",
|
||||
"groovy": "sha256-lytD+79N/WswnLLpfRElTktDQ5P24voQgthdBX7aagw=",
|
||||
"migration": "sha256-taai2JRCyC6oJM6u25mEKLUtGs/5RAx7GXIM8lWk3b4=",
|
||||
"prometheus": "sha256-CcurL21i8cHXj6tYIbU84/wBMSJuLSnHXLRCTY5H1OU=",
|
||||
"swagger": "sha256-ULk0HpKTZyq1DOb3XAG3OiDbmQS6YA3pV9X0jdzoD8Q="
|
||||
"checksum": "sha256-uZTVXSw8TgW6Lt+VnVOaqTckZfxZajNjYam/yTrz12g=",
|
||||
"groovy": "sha256-zs6hMErwtSwu8oPBiho2tDsR9xn2LaXG6mM14TK1F0k=",
|
||||
"migration": "sha256-WKL2tLNx86tXkjvoowzGrPnYrl7WlJtVeuyMwWq9gP0=",
|
||||
"prometheus": "sha256-DIE0W6hZOrlH7zwml4ibM8bxEzORyNkfuSBoSpurpl8=",
|
||||
"swagger": "sha256-Ugxi/iGej8UR7M8XXKW6h49++lGilVl6edTr5hjJF4s="
|
||||
}
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
# Pinned to python 3.12 while python313Packages.future does not evaluate and
|
||||
# until https://github.com/CZ-NIC/pyoidc/issues/649 is resolved
|
||||
{ python312Packages }: with python312Packages; toPythonApplication rucio
|
||||
{ python3Packages }: with python3Packages; toPythonApplication rucio
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
From 8c04235655a79f9b39003e49ea3bfa921e42e371 Mon Sep 17 00:00:00 2001
|
||||
From: Marie Ramlow <me@nycode.dev>
|
||||
Date: Wed, 26 Aug 2026 17:16:42 +0200
|
||||
Subject: [PATCH] Fix backup restoration when using a unix socket
|
||||
|
||||
---
|
||||
app/Console/Commands/RestoreFromBackup.php | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php
|
||||
index ba5d9aa8df..f449420cc5 100644
|
||||
--- a/app/Console/Commands/RestoreFromBackup.php
|
||||
+++ b/app/Console/Commands/RestoreFromBackup.php
|
||||
@@ -510,7 +510,9 @@ class RestoreFromBackup extends Command
|
||||
' --batch '.
|
||||
' --binary-mode '.
|
||||
' -u '.escapeshellarg($connectionConfig['username']).' '.
|
||||
- ' -P '.escapeshellarg($connectionConfig['port']).' '.
|
||||
+ (empty($connectionConfig['unix_socket'])
|
||||
+ ? ' -P '.escapeshellarg($connectionConfig['port'])
|
||||
+ : ' -S '.escapeshellarg($connectionConfig['unix_socket'])). ' '.
|
||||
escapeshellarg($connectionConfig['database']), // yanked -p since we pass via ENV
|
||||
[0 => ['pipe', 'r'], 1 => ['pipe', 'w'], 2 => ['pipe', 'w']],
|
||||
$pipes,
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@@ -12,16 +12,20 @@ let
|
||||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "snipe-it";
|
||||
version = "8.4.1";
|
||||
version = "8.7.2";
|
||||
|
||||
patches = [
|
||||
./0001-Fix-backup-restoration-when-using-a-unix-socket.patch
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grokability";
|
||||
repo = "snipe-it";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SSz0bFhspS3c5z0+mpub6gIqiMwzJ/5YfzPs9NdClCo=";
|
||||
hash = "sha256-ND/Et3zRhD4axNNfaq4MW4sLj3634VhnDdAtZUxnEJU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-crHl0CU5nf1SuXWf2O4tDLiNW1T7ku5cfNXjeNE6bDw=";
|
||||
vendorHash = "sha256-9mihxUDylADJCbLSxVj+qHfT8BW6rO2qjRzhGQJT0jM=";
|
||||
|
||||
postInstall = ''
|
||||
snipe_it_out="$out/share/php/snipe-it"
|
||||
|
||||
@@ -92,9 +92,9 @@
|
||||
major = "3";
|
||||
minor = "15";
|
||||
patch = "0";
|
||||
suffix = "rc1";
|
||||
suffix = "rc2";
|
||||
};
|
||||
hash = "sha256-+E2taAqyFHQX0nOTVcJnjw+az/5K6O93iV3hRUs4Swc=";
|
||||
hash = "sha256-jZOvXqqupa39Qb14anuj8D8q0atXxqZeC5Y96rkdWtc=";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrazer";
|
||||
repo = "openrazer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-X1NPqbugBdxD5Nt9wIwQADV4CuydGLpgKhlNazVdrIY=";
|
||||
hash = "sha256-WgDYs0ehnzWlX/wvfur0UhFLbZv7jZ6FMybqDaFDuLg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://openrazer.github.io/";
|
||||
changelog = "https://github.com/openrazer/openrazer/releases/tag/${src.tag}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ evanjs ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
packaging,
|
||||
@@ -54,9 +53,6 @@ buildPythonPackage {
|
||||
inherit version src;
|
||||
pyproject = true;
|
||||
|
||||
# future-1.0.0 not supported for interpreter python3.13
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonRemoveDeps = [ "boto" ];
|
||||
|
||||
@@ -404,6 +404,9 @@ let
|
||||
# HAM radio
|
||||
HAMRADIO = whenOlder "7.1" yes;
|
||||
AX25 = whenOlder "7.1" module;
|
||||
|
||||
# Gate for the DINGHAI_PF module
|
||||
DINGHAI = whenAtLeast "7.3" yes;
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# Not enabled by default, hides modules behind it
|
||||
@@ -708,6 +711,7 @@ let
|
||||
|
||||
NTFS_FS = whenBetween "5.15" "6.9" no;
|
||||
NTFS_FS_POSIX_ACL = whenAtLeast "7.1" yes;
|
||||
NTFS_FS_WOF_COMPRESSION = whenAtLeast "7.3" yes;
|
||||
NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes;
|
||||
NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes;
|
||||
|
||||
@@ -1360,6 +1364,7 @@ let
|
||||
BINFMT_SCRIPT = yes;
|
||||
# For systemd-binfmt
|
||||
BINFMT_MISC = option yes;
|
||||
BINFMT_MISC_BPF = whenAtLeast "7.3" (whenPlatformHasEBPFJit (option yes));
|
||||
|
||||
# Required for EDID overriding
|
||||
FW_LOADER = yes;
|
||||
@@ -1375,6 +1380,8 @@ let
|
||||
# Allos PCIe devices report errors with Advanced Error Reporting (AER).
|
||||
PCIEAER = yes;
|
||||
ACPI_APEI_PCIEAER = yes;
|
||||
# PCIe link training status, e.g. on Cix P1
|
||||
PCIE_CADENCE_DEBUGFS = whenAtLeast "7.3" (option yes);
|
||||
|
||||
# Enable all available thermal governors
|
||||
THERMAL_GOV_BANG_BANG = yes;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "7.2-rc7",
|
||||
"hash": "sha256:1qr0k903z5v5w9zm5xsmmzcgxmxgx9vwz32g6zhs14s4sn5s0dgw",
|
||||
"version": "7.3-rc2",
|
||||
"hash": "sha256:1ysspc93ggydcic9dsg6ibkr1xcfakqjfp9xymma9pwq6wybpwnb",
|
||||
"lts": false
|
||||
},
|
||||
"6.1": {
|
||||
@@ -25,23 +25,18 @@
|
||||
"lts": true
|
||||
},
|
||||
"6.12": {
|
||||
"version": "6.12.108",
|
||||
"hash": "sha256:1bxsykj1w8slrn837z05ax8r9d5kkgk5kbjzbngmrm921lhfmlg1",
|
||||
"version": "6.12.109",
|
||||
"hash": "sha256:1yp370f2y5czvq24xqply8f6a14gnpjqkfmfyhcm1q9lld9fb12l",
|
||||
"lts": true
|
||||
},
|
||||
"6.18": {
|
||||
"version": "6.18.49",
|
||||
"hash": "sha256:14c1l9hbqcjlzfl7bssa43yqsg26sycp5plx4wfnzshz24rnz0mf",
|
||||
"version": "6.18.50",
|
||||
"hash": "sha256:0q842zpaqb5vi749g2lawa62p9gsb3h3p99vbrjdj4afmcfh9z6j",
|
||||
"lts": true
|
||||
},
|
||||
"7.1": {
|
||||
"version": "7.1.13",
|
||||
"hash": "sha256:1mqshj3ldn0md1c0am35skznnq5vmz3fvrr0cqmwwp6bzpx9akb1",
|
||||
"lts": false
|
||||
},
|
||||
"7.2": {
|
||||
"version": "7.2.3",
|
||||
"hash": "sha256:00yd1rar9dxgdfx1003c9m5bs90bv6da7j2117pwcgmiwzl5k8lb",
|
||||
"version": "7.2.4",
|
||||
"hash": "sha256:1p98bi0zzk3al2d0i28ms4h8vq2ps3n2prdsy69c9nip2zh0ww81",
|
||||
"lts": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ in
|
||||
buildLinux (
|
||||
args
|
||||
// rec {
|
||||
version = "7.1.10";
|
||||
version = "7.2.3";
|
||||
pname = "linux-zen";
|
||||
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
|
||||
isZen = true;
|
||||
@@ -27,7 +27,7 @@ buildLinux (
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "0c01cnamvl3mdc1rm7pjpcy5s6s9yamfkg413zn7k2xwkjig8b08";
|
||||
sha256 = "033njpi0wrgq1619xncsz5ixzy1m2arqwdfnq11hng0j2qnxiw4h";
|
||||
};
|
||||
|
||||
# This is based on the following source:
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roundcube";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
|
||||
sha256 = "sha256-RDzeLqA7hAzkcB/iPCc/AeaHAvF20oLmAkgja7tfX4U=";
|
||||
sha256 = "sha256-LGyHjwCT8b9/tghngdLdkmnWUsAWuGk5wVfF8XKROaI=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
|
||||
|
||||
@@ -92,14 +92,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "7.1";
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
|
||||
linux_7_2 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "7.2";
|
||||
kernelPatches = [
|
||||
@@ -176,6 +168,7 @@ in
|
||||
linux_6_17 = throw "linux 6.17 was removed because it has reached its end of life upstream";
|
||||
linux_6_19 = throw "linux 6.19 was removed because it has reached its end of life upstream";
|
||||
linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream";
|
||||
linux_7_1 = throw "linux 7.1 was removed because it has reached its end of life upstream";
|
||||
|
||||
linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
|
||||
linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
|
||||
@@ -675,7 +668,6 @@ in
|
||||
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
|
||||
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
|
||||
linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
|
||||
linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1);
|
||||
linux_7_2 = recurseIntoAttrs (packagesFor kernels.linux_7_2);
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
@@ -691,6 +683,7 @@ in
|
||||
linux_6_17 = throw "linux 6.17 was removed because it reached its end of life upstream"; # Added 2025-12-22
|
||||
linux_6_19 = throw "linux 6.19 was removed because it reached its end of life upstream"; # Added 2026-04-23
|
||||
linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; # Added 2026-06-27
|
||||
linux_7_1 = throw "linux 7.1 was removed because it has reached its end of life upstream"; # Added 2026-09-02
|
||||
};
|
||||
|
||||
rpiPackages = {
|
||||
|
||||
Reference in New Issue
Block a user