nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 20:16:03 +01:00
Code Activity

Merge pull request #13785 from xokdvium/25.05-nixpkgs

Browse source 
flake: nixpkgs: nixos-unstable -> nixos-25.05-small
This commit is contained in:
Sergei Zimmerman 2025-08-18 20:57:46 +03:00 • committed by GitHub
commit b263bfcecd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 250 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.git-blame-ignore-revs
View file

@ -2,3 +2,5 @@
e4f62e46088919428a68bd8014201dc8e379fed7 # !autorebase ./maintainers/format.sh --until-stable e4f62e46088919428a68bd8014201dc8e379fed7 # !autorebase ./maintainers/format.sh --until-stable
# meson re-formatting # meson re-formatting
385e2c3542c707d95e3784f7f6d623f67e77ab61 # !autorebase ./maintainers/format.sh --until-stable 385e2c3542c707d95e3784f7f6d623f67e77ab61 # !autorebase ./maintainers/format.sh --until-stable
# nixfmt 1.0.0
1d943f581908f35075a84a3d89c2eba3ff35067f # !autorebase ./maintainers/format.sh --until-stable

4
ci/gha/tests/default.nix
View file

@ -55,9 +55,7 @@ let
}; };
# Done in a pre-configure hook, because $NIX_BUILD_TOP needs to be substituted. # Done in a pre-configure hook, because $NIX_BUILD_TOP needs to be substituted.
preConfigure = preConfigure = prevAttrs.preConfigure or "" + ''
prevAttrs.preConfigure or ""
+ ''
mappingFlag=" -fcoverage-prefix-map=$NIX_BUILD_TOP/${finalAttrs.src.name}=${finalAttrs.src}" mappingFlag=" -fcoverage-prefix-map=$NIX_BUILD_TOP/${finalAttrs.src.name}=${finalAttrs.src}"
CFLAGS+="$mappingFlag" CFLAGS+="$mappingFlag"
CXXFLAGS+="$mappingFlag" CXXFLAGS+="$mappingFlag"

3
doc/manual/package.nix
View file

@ -46,8 +46,7 @@ mkMesonDerivation (finalAttrs: {
]; ];
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.externalNativeBuildInputs = passthru.externalNativeBuildInputs = [
[
meson meson
ninja ninja
(lib.getBin lowdown-unsandboxed) (lib.getBin lowdown-unsandboxed)

9
docker.nix
View file

@ -65,10 +65,10 @@ let
iana-etc iana-etc
gitMinimal gitMinimal
openssh openssh
] ++ extraPkgs; ]
++ extraPkgs;
users = users = {
{
root = { root = {
uid = 0; uid = 0;
@ -111,8 +111,7 @@ let
}) (lib.lists.range 1 32) }) (lib.lists.range 1 32)
); );
groups = groups = {
{
root.gid = 0; root.gid = 0;
nixbld.gid = 30000; nixbld.gid = 30000;
nobody.gid = 65534; nobody.gid = 65534;

8
flake.lock generated
View file

@ -63,16 +63,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747179050, "lastModified": 1755442223,
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "narHash": "sha256-VtMQg02B3kt1oejwwrGn50U9Xbjgzfbb5TV5Wtx8dKI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "rev": "cd32a774ac52caaa03bcfc9e7591ac8c18617ced",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "The purely functional package manager"; description = "The purely functional package manager";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2"; inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446"; inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";

3
packaging/components.nix
View file

@ -148,7 +148,8 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
] ++ prevAttrs.nativeBuildInputs or [ ]; ]
++ prevAttrs.nativeBuildInputs or [ ];
mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [ mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [
"--print-errorlogs" "--print-errorlogs"
]; ];

8
packaging/dev-shell.nix
View file

@ -71,8 +71,7 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
# We use this shell with the local checkout, not unpackPhase. # We use this shell with the local checkout, not unpackPhase.
src = null; src = null;
env = env = {
{
# For `make format`, to work without installing pre-commit # For `make format`, to work without installing pre-commit
_NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml" _NIX_PRE_COMMIT_HOOKS_CONFIG = "${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml"
modular.pre-commit.settings.rawConfig modular.pre-commit.settings.rawConfig
@ -126,8 +125,9 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
) )
++ lib.optional stdenv.hostPlatform.isLinux pkgs.buildPackages.mold-wrapped; ++ lib.optional stdenv.hostPlatform.isLinux pkgs.buildPackages.mold-wrapped;
buildInputs = buildInputs = [
[ pkgs.gbenchmark ] pkgs.gbenchmark
]
++ attrs.buildInputs or [ ] ++ attrs.buildInputs or [ ]
++ pkgs.nixComponents2.nix-util.buildInputs ++ pkgs.nixComponents2.nix-util.buildInputs
++ pkgs.nixComponents2.nix-store.buildInputs ++ pkgs.nixComponents2.nix-store.buildInputs

13
packaging/everything.nix
View file

@ -47,8 +47,7 @@
}: }:
let let
libs = libs = {
{
inherit inherit
nix-util nix-util
nix-util-c nix-util-c
@ -65,7 +64,8 @@ let
nix-cmd nix-cmd
; ;
} }
// lib.optionalAttrs //
lib.optionalAttrs
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
{ {
# Currently fails in static build # Currently fails in static build
@ -127,8 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
*/ */
dontFixup = true; dontFixup = true;
checkInputs = checkInputs = [
[
# Make sure the unit tests have passed # Make sure the unit tests have passed
nix-util-tests.tests.run nix-util-tests.tests.run
nix-store-tests.tests.run nix-store-tests.tests.run
@ -139,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: {
# Make sure the functional tests have passed # Make sure the functional tests have passed
nix-functional-tests nix-functional-tests
] ]
++ lib.optionals ++
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform) lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
[ [
# Perl currently fails in static build # Perl currently fails in static build
# TODO: Split out tests into a separate derivation? # TODO: Split out tests into a separate derivation?

3
src/libcmd/package.nix
View file

@ -53,7 +53,8 @@ mkMesonLibrary (finalAttrs: {
buildInputs = [ buildInputs = [
({ inherit editline readline; }.${readlineFlavor}) ({ inherit editline readline; }.${readlineFlavor})
] ++ lib.optional enableMarkdown lowdown; ]
++ lib.optional enableMarkdown lowdown;
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util nix-util

6
src/libexpr/package.nix
View file

@ -70,13 +70,15 @@ mkMesonLibrary (finalAttrs: {
nix-util nix-util
nix-store nix-store
nix-fetchers nix-fetchers
] ++ finalAttrs.passthru.externalPropagatedBuildInputs; ]
++ finalAttrs.passthru.externalPropagatedBuildInputs;
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.externalPropagatedBuildInputs = [ passthru.externalPropagatedBuildInputs = [
boost boost
nlohmann_json nlohmann_json
] ++ lib.optional enableGC boehmgc; ]
++ lib.optional enableGC boehmgc;
mesonFlags = [ mesonFlags = [
(lib.mesonEnable "gc" enableGC) (lib.mesonEnable "gc" enableGC)

3
src/libstore-tests/package.nix
View file

@ -43,8 +43,7 @@ mkMesonExecutable (finalAttrs: {
]; ];
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.externalBuildInputs = passthru.externalBuildInputs = [
[
sqlite sqlite
rapidcheck rapidcheck
gtest gtest

6
src/libstore/package.nix
View file

@ -58,8 +58,7 @@ mkMesonLibrary (finalAttrs: {
nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump; nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump;
buildInputs = buildInputs = [
[
boost boost
curl curl
sqlite sqlite
@ -74,8 +73,7 @@ mkMesonLibrary (finalAttrs: {
nlohmann_json nlohmann_json
]; ];
mesonFlags = mesonFlags = [
[
(lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux) (lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
(lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell) (lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
] ]

3
src/libutil/package.nix
View file

@ -52,7 +52,8 @@ mkMesonLibrary (finalAttrs: {
libblake3 libblake3
libsodium libsodium
openssl openssl
] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid; ]
++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
propagatedBuildInputs = [ propagatedBuildInputs = [
boost boost

3
src/perl/package.nix
View file

@ -45,7 +45,8 @@ perl.pkgs.toPerlModule (
buildInputs = [ buildInputs = [
nix-store nix-store
] ++ finalAttrs.passthru.externalBuildInputs; ]
++ finalAttrs.passthru.externalBuildInputs;
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.externalBuildInputs = [ passthru.externalBuildInputs = [

3
tests/functional/lang/eval-okay-attrnames.nix
View file

@ -2,8 +2,7 @@ with import ./lib.nix;
let let
attrs = attrs = {
{
y = "y"; y = "y";
x = "x"; x = "x";
foo = "foo"; foo = "foo";

3
tests/functional/lang/eval-okay-attrs.nix
View file

@ -1,6 +1,5 @@
let { let {
as = as = {
{
x = 123; x = 123;
y = 456; y = 456;
} }

3
tests/functional/lang/eval-okay-attrs2.nix
View file

@ -1,6 +1,5 @@
let { let {
as = as = {
{
x = 123; x = 123;
y = 456; y = 456;
} }

3
tests/functional/lang/eval-okay-import.nix
View file

@ -6,7 +6,8 @@ let
scopedImport = attrs: fn: scopedImport (overrides // attrs) fn; scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
builtins = builtins // overrides; builtins = builtins // overrides;
} // import ./lib.nix; }
// import ./lib.nix;
in in
scopedImport overrides ./imported.nix scopedImport overrides ./imported.nix

3
tests/functional/nested-sandboxing/runner.nix
View file

@ -6,8 +6,7 @@ mkDerivation {
name = "nested-sandboxing"; name = "nested-sandboxing";
busybox = builtins.getEnv "busybox"; busybox = builtins.getEnv "busybox";
EXTRA_SANDBOX = builtins.getEnv "EXTRA_SANDBOX"; EXTRA_SANDBOX = builtins.getEnv "EXTRA_SANDBOX";
buildCommand = buildCommand = ''
''
set -x set -x
set -eu -o pipefail set -eu -o pipefail
'' ''

3
tests/functional/package.nix
View file

@ -47,8 +47,7 @@ mkMesonDerivation (
]; ];
# Hack for sake of the dev shell # Hack for sake of the dev shell
passthru.externalNativeBuildInputs = passthru.externalNativeBuildInputs = [
[
meson meson
ninja ninja
pkg-config pkg-config

3
tests/nixos/remote-builds.nix
View file

@ -20,7 +20,8 @@ let
nix.settings.sandbox = true; nix.settings.sandbox = true;
services.openssh.ports = [ services.openssh.ports = [
22 22
] ++ lib.optional supportsCustomPort 2222; ]
++ lib.optional supportsCustomPort 2222;
# Regression test for use of PID namespaces when /proc has # Regression test for use of PID namespaces when /proc has
# filesystems mounted on top of it # filesystems mounted on top of it