movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-04-02 18:05:39 +00:00 • committed by GitHub
commit 76e756ecc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 1780 additions and 1313 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/version-management/git/default.nix
View file

@ -507,6 +507,13 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
disable_test t7527-builtin-fsmonitor
''
+
lib.optionalString (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.system == "x86_64-linux")
''
# https://github.com/NixOS/nixpkgs/pull/394957
# > t2082-parallel-checkout-attributes.sh (Wstat: 256 (exited 1) Tests: 5 Failed: 1)
disable_test t2082-parallel-checkout-attributes
''
+ lib.optionalString stdenv.hostPlatform.isMusl ''
# Test fails (as of 2.17.0, musl 1.1.19)
disable_test t3900-i18n-commit

6
pkgs/by-name/br/bruno/package.nix
View file

@ -17,20 +17,20 @@
buildNpmPackage rec {
pname = "bruno";
version = "1.40.1";
version = "2.0.1";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
tag = "v${version}";
hash = "sha256-1QJjdvH3cjZJKDWnua7EeqVEXaMEqYcv44jqG/O0+a4=";
hash = "sha256-iKwmBkeyKlahzmPCPZ/S8XwIgTK6qD2XHiQkUu2nnZQ=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-6L/SFdHykhBQgB7bi4w+y4Lc+uLIdM4WSmGS0H6Dz4U=";
npmDepsHash = "sha256-t6KZc48nS9hyQZdOS4lVgcMw9RyyK7jEmMjA41s4HaY=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs =

2950
pkgs/by-name/co/collabora-online/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

17
pkgs/by-name/co/collabora-online/package.nix
View file

@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "collabora-online";
version = "24.04.6-1";
version = "24.04.13-2";
src = fetchFromGitHub {
owner = "CollaboraOnline";
repo = "online";
tag = "cp-${finalAttrs.version}";
hash = "sha256-0IvymvXAozsjm+GXJK9AGWo79QMaIACrAfkYfX67fBc=";
hash = "sha256-d6i/aSmbim7UAKz9VX1ClbtIQravMq0r8beZC9FD6as=";
};
nativeBuildInputs = [
@ -56,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
zstd
];
enableParallelBuilding = true;
configureFlags = [
"--disable-setcap"
"--disable-werror"
@ -66,11 +68,11 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./fix-file-server-regex.patch
# Remove after next release
# https://github.com/CollaboraOnline/online/pull/11464/
(fetchpatch {
name = "add-missing-includes-for-poco-1.14.1";
url = "https://patch-diff.githubusercontent.com/raw/CollaboraOnline/online/pull/11196.patch";
hash = "sha256-ke4dOxITFHK3xMXIdp+zzUEGYMyDxMJrbbXTN+LaoVU=";
name = "fix-testPreProcessedFileSubstitution";
url = "https://github.com/CollaboraOnline/online/commit/76a4b64297d721d66603dc63f525324475036917.patch";
hash = "sha256-PGys1dpHLFsUKKA1YyxkJpbBbc2prySdGH/CZni90kI=";
})
];
@ -94,14 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
hash = "sha256-CUh+jwJnKtmzk8w6QwH1Nh92500dFj63ThkI4tN5FyQ=";
hash = "sha256-0RnGt9NLgyARgbh2GOcz7H3l4vtij8PD5jmcdUDB/5Y=";
};
npmRoot = "browser";
passthru = {
libreoffice = libreoffice-collabora; # Used by NixOS module.
updateScript = ./update.sh;
};
meta = {

2
pkgs/by-name/co/collabora-online/update.sh
View file

@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd
#! nix-shell -i bash -p common-updater-scripts prefetch-npm-deps jq sd nodejs
#shellcheck shell=bash
set -xeu -o pipefail

20
pkgs/by-name/na/natscli/package.nix
View file

@ -7,30 +7,40 @@
buildGoModule rec {
pname = "natscli";
version = "0.1.6";
version = "0.2.0";
src = fetchFromGitHub {
owner = "nats-io";
repo = "natscli";
tag = "v${version}";
hash = "sha256-kdoBHTJq/Sj27BOD4NFDVpMlywG5H7vGRS6uUbPscOY=";
hash = "sha256-Ya3nNgPa9MEiDDwoBv8oXi7+Hji9fhUNIm55jJ6w++8=";
};
vendorHash = "sha256-RM0PskgKT+n2EQkoIwIbCAwh03TLdcwj7g8AjXBeZPY=";
vendorHash = "sha256-NLsIX0B2YKGNWeAuKIQUs/2sXokUr6PYO5qvvfbbN1Y=";
ldflags = [
"-X main.version=${version}"
"-s"
"-w"
"-X=main.version=${version}"
];
nativeInstallCheckInputs = [ versionCheckHook ];
preCheck = ''
# Remove tests that depend on CLI output
substituteInPlace internal/asciigraph/asciigraph_test.go \
--replace-fail "TestPlot" "SkipPlot"
'';
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/nats";
meta = with lib; {
description = "NATS Command Line Interface";
homepage = "https://github.com/nats-io/natscli";
changelog = "https://github.com/nats-io/natscli/releases/tag/v${version}";
license = with licenses; [ asl20 ];
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
mainProgram = "nats";
};

13
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -399,17 +399,16 @@ builtins.intersectAttrs super {
src = pkgs.fetchFromGitHub {
repo = "nix-serve-ng";
owner = "aristanetworks";
rev = "578ad85b3096d99b25cae0a73c03df4e82f587c7";
hash = "sha256-2LPx4iRJonX4gtd3r73DBM/ZhN/hKu1lb/MHOav8c5s=";
rev = "6e8d82a451fccbaa4714da8f7a3db5907bdfa96d";
hash = "sha256-Ht5wD/n2I/tQWNgYIdmi3UQbm1FNwp9m9JmDjZEd6ng=";
};
version = "1.0.0-unstable-2024-10-01";
version = "1.0.0-unstable-2024-12-02";
#editedCabalFile = null;
# Doesn't declare boost dependency
pkg-configDepends = (old.pkg-configDepends or [ ]) ++ [ pkgs.boost.dev ];
patches = (old.patches or [ ]) ++ [
# Part of https://github.com/aristanetworks/nix-serve-ng/pull/40
./patches/nix-serve-ng-nix.2.24.patch
];
# error: output '/nix/store/hv6lzj1nlshn8q5lirzgys8f4vgym4hg-nix-serve-ng-1.0.0-unstable-2024-12-02' is not allowed to refer to the following paths:
# /nix/store/qza2y18fwkq1wzi02qywf691r42r5jfy-ghc-9.6.6
broken = pkgs.stdenv.hostPlatform.system == "aarch64-darwin";
}) super.nix-serve-ng).override
{
nix = pkgs.nixVersions.nix_2_24;

55
pkgs/development/haskell-modules/patches/nix-serve-ng-nix.2.24.patch
View file

@ -1,55 +0,0 @@
From 97cb18bee646a23bd08e3959d6544e703e0bb862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 26 Nov 2024 08:39:30 +0100
Subject: [PATCH] fix build against nix 2.24
---
cbits/nix.cpp | 6 +++---
nix-serve-ng.cabal | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cbits/nix.cpp b/cbits/nix.cpp
index 8872af1..6305001 100644
--- a/cbits/nix.cpp
+++ b/cbits/nix.cpp
@@ -1,6 +1,7 @@
#include <cstddef>
#include <cstdlib>
#include <nix/store-api.hh>
+#include <nix/shared.hh>
#include <nix/log-store.hh>
#include "nix.hh"
@@ -14,8 +15,7 @@ static ref<Store> getStore()
static std::shared_ptr<Store> _store;
if (!_store) {
- initLibStore();
- loadConfFile();
+ initLibStore(true);
_store = openStore();
}
@@ -120,7 +120,7 @@ void queryPathInfo
output->deriver = emptyString;
};
- copyString(validPathInfo->narHash.to_string(Base32, true), &output->narHash);
+ copyString(validPathInfo->narHash.to_string(nix::HashFormat::Nix32, true), &output->narHash);
output->narSize = validPathInfo->narSize;
diff --git a/nix-serve-ng.cabal b/nix-serve-ng.cabal
index 9298f9a..8443b04 100644
--- a/nix-serve-ng.cabal
+++ b/nix-serve-ng.cabal
@@ -36,7 +36,7 @@ executable nix-serve
cxx-sources: cbits/nix.cpp
, cbits/nix.hh
- cxx-options: -std=c++17
+ cxx-options: -std=c++20
build-depends: base < 5
, base16 >= 1.0

7
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -815,7 +815,12 @@ stdenv.mkDerivation (finalAttrs: {
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
mainProgram = executable;
maintainers = lib.teams.python.members;
# static build on x86_64-darwin/aarch64-darwin breaks with:
# configure: error: C compiler cannot create executables
# mingw patches only apply to Python 3.11 currently
broken = (lib.versions.minor version) != "11" && stdenv.hostPlatform.isWindows;
broken =
(lib.versions.minor version != "11" && stdenv.hostPlatform.isWindows)
|| (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isDarwin);
};
})

4
pkgs/development/python-modules/pylacus/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pylacus";
version = "1.13.1";
version = "1.13.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "PyLacus";
tag = "v${version}";
hash = "sha256-oA2AuodhRox36gSp9adTdFIHQtmSoSaWmZYpvPnoHSQ=";
hash = "sha256-EZhlAlZbxcZRpdeAqIwEXV9YPyleW2jnea+e5jRL1EE=";
};
build-system = [ poetry-core ];

8
pkgs/development/python-modules/pysmb/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysmb";
version = "1.2.10";
version = "1.2.11";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "miketeo";
repo = "pysmb";
tag = "pysmb-${version}";
hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE=";
hash = "sha256-V5RSEHtAi8TaKlrSGc1EQbm1ty6mUonfZ3iME6fDwY8=";
};
build-system = [ setuptools ];
@ -39,9 +39,9 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Experimental SMB/CIFS library to support file sharing between Windows and Linux machines";
homepage = "https://pysmb.readthedocs.io/";
changelog = "https://github.com/miketeo/pysmb/releases/tag/pysmb-${version}";
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
license = licenses.zlib;
maintainers = with maintainers; [ kamadorueda ];
};

4
pkgs/development/python-modules/superqt/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "superqt";
version = "0.7.2";
version = "0.7.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "pyapp-kit";
repo = "superqt";
tag = "v${version}";
hash = "sha256-G+z1q1hSvF7Of197bycACRqxPc+fjxU93PDxMcMWCME=";
hash = "sha256-u9HnuqPcHb0Sk+UtgrCt9oziW1hCA6aQsieRO/ZG9fU=";
};
build-system = [