nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-16 00:17:03 +00:00
committed by GitHub
parent 9c89f1c28b 80f4210173
commit 55c873a258
10 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/doc/manual/installation/installing.chapter.md
View File

@@ -500,6 +500,12 @@ Use the following commands:
Retype new password: ***
```
If you have a user account declared in your `configuration.nix` and plan to log in using this user, set a password before rebooting, e.g. for the `alice` user:
```ShellSession
# nixos-enter --root /mnt -c 'passwd alice'
```
::: {.note}
For unattended installations, it is possible to use
`nixos-install --no-root-passwd` in order to disable the password
@@ -519,15 +525,13 @@ Use the following commands:
menu. This allows you to easily roll back to a previous
configuration if something goes wrong.
You should log in and change the `root` password with `passwd`.
Use your declared user account to log in.
If you didn’t declare one, you should still be able to log in using the `root` user.
You'll probably want to create some user accounts as well, which can
be done with `useradd`:
```ShellSession
$ useradd -c 'Eelco Dolstra' -m eelco
$ passwd eelco
```
::: {.note}
Some graphical display managers such as SDDM do not allow `root` login by default, so you might need to switch to TTY.
Refer to [](#sec-user-management) for details on declaring user accounts.
:::
You may also want to install some software. This will be covered in
[](#sec-package-management).

3
pkgs/development/tools/gauge/plugins/dotnet/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, makeGaugePlugin
, gauge-unwrapped
, stdenv
}:
makeGaugePlugin {
@@ -11,6 +12,8 @@ makeGaugePlugin {
releasePrefix = "gauge-dotnet-";
isCrossArch = true;
buildInputs = [ stdenv.cc.cc.lib ];
meta = {
description = "Gauge plugin that lets you write tests in C#";
homepage = "https://github.com/getgauge/gauge-dotnet/";

3
pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix
View File

@@ -2,6 +2,7 @@
, fetchzip
, lib
, writeScript
, autoPatchelfHook
}:
{ pname
@@ -33,6 +34,8 @@ stdenvNoCC.mkDerivation (finalAttrs: (lib.recursiveUpdate {
stripRoot = false;
};
nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook;
installPhase = ''
mkdir -p "$out/share/gauge-plugins/${pname}/${finalAttrs.version}"
cp -r . "$out/share/gauge-plugins/${pname}/${finalAttrs.version}"

4
pkgs/development/tools/misc/strace/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.10";
version = "6.11";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
hash = "sha256-dl7HGqHeL+NzY8HkDHt2afwdQMRLtdOLqOjNgsTtzwc=";
hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

7
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -459,6 +459,9 @@ let
# Enable AMD secure display when available
DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes;
# Enable AMD image signal processor
DRM_AMD_ISP = whenAtLeast "6.11" yes;
# Enable new firmware (and by extension NVK) for compatible hardware on Nouveau
DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes;
@@ -720,6 +723,10 @@ let
# Enable stack smashing protections in schedule()
# See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f
SCHED_STACK_END_CHECK = yes;
# Enable separate slab buckets for user controlled allocations
# See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41
SLAB_BUCKETS = whenAtLeast "6.11" yes;
} // optionalAttrs stdenv.hostPlatform.isx86_64 {
# Enable Intel SGX
X86_SGX = whenAtLeast "5.11" yes;

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

@@ -38,5 +38,9 @@
"6.10": {
"version": "6.10.10",
"hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6"
},
"6.11": {
"version": "6.11",
"hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm"
}
}

11
pkgs/servers/http/envoy/default.nix
View File

@@ -3,7 +3,6 @@
, bazel-gazelle
, buildBazelPackage
, fetchFromGitHub
, fetchpatch
, stdenv
, cmake
, gn
@@ -25,15 +24,15 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.30.4";
rev = "32113313a357829ba3a5dce0795b6780bf8cbf4d";
hash = "sha256-u9lTVe40pwXTt0YRwJXRuZonS5KJL2JQUQ3L9ymuA74=";
version = "1.30.5";
rev = "20d3fc67fb757d7d7a644e0e0bfc3988b1df56ab";
hash = "sha256-uogckAaP+eumY1GZw2+T3CusLE0gR2VEV96/lroQ6+g=";
};
# these need to be updated for any changes to fetchAttrs
depsHash = {
x86_64-linux = "sha256-m7dMr/dCmjpKLPT+8FXBHGkTlNoN9x1oQ7D6uO0sHtQ=";
aarch64-linux = "sha256-9GqVpWkMHP9nb5EZHjGKixkWazi//oLlIUum45xTvoM=";
x86_64-linux = "sha256-SJ8ZPOYIptLOWo3tp/fdyYy2Iyyy1BYSz0Kc3p5OWbQ=";
aarch64-linux = "sha256-TBCJfw31aC6wUmp6Osg8BbXy5AbcPN0DyJuUCHqmoMo=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
in
buildBazelPackage {

4
pkgs/tools/security/clamav/default.nix
View File

@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "clamav";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
hash = "sha256-EqMDW/JvVfceMQalGl+o17dEVy35imOSCpz/h2p9zOQ=";
hash = "sha256-5YJLY2DhQSxGyUBPaEnZLw8qHd6ZsgLoKiGh5nhXK6k=";
};
patches = [

2
pkgs/top-level/aliases.nix
View File

@@ -705,6 +705,7 @@ mapAliases ({
linuxPackages_6_8 = linuxKernel.packages.linux_6_8;
linuxPackages_6_9 = linuxKernel.packages.linux_6_9;
linuxPackages_6_10 = linuxKernel.packages.linux_6_10;
linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -734,6 +735,7 @@ mapAliases ({
linux_6_8 = linuxKernel.kernels.linux_6_8;
linux_6_9 = linuxKernel.kernels.linux_6_9;
linux_6_10 = linuxKernel.kernels.linux_6_10;
linux_6_11 = linuxKernel.kernels.linux_6_11;
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linux_rpi02w = linuxKernel.kernels.linux_rpi3;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;

11
pkgs/top-level/linux-kernels.nix
View File

@@ -193,6 +193,14 @@ in {
];
};
linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.11";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = let
testing = callPackage ../os-specific/linux/kernel/mainline.nix {
# A special branch that tracks the kernel under the release process
@@ -608,6 +616,7 @@ in {
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10);
linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);
__attrsFailEvaluation = true;
} // lib.optionalAttrs config.allowAliases {
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
@@ -679,7 +688,7 @@ in {
packageAliases = {
linux_default = packages.linux_6_6;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_6_10;
linux_latest = packages.linux_6_11;
linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
linux_rt_default = packages.linux_rt_5_15;
linux_rt_latest = packages.linux_rt_6_6;