nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: 260.4 -> 260.5 (#563830)

Browse Source
This commit is contained in:
Will Fancher
2026-09-20 02:50:33 +00:00
committed by GitHub
parent fd8892684a c567535f40
commit f278f3ff19
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/systemd/0001-Don-t-try-to-unmount-nix-or-nix-store.patch
View File

@@ -14,7 +14,7 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 25e229bf3e..b9af1c3b13 100644
index a4f5e348ab..d506b5598e 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -76,6 +76,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {

16
pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
View File

@@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644
<literal>Etc/UTC</literal>. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 5dd00af952..b97a41f6ac 100644
index 6873017bf5..7455aa30ae 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1443,7 +1443,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -1446,7 +1446,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
assert(ret);
@@ -47,7 +47,7 @@ index 5dd00af952..b97a41f6ac 100644
if (!f)
return -errno;
@@ -1488,7 +1488,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
@@ -1491,7 +1491,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
assert(ret);
@@ -56,7 +56,7 @@ index 5dd00af952..b97a41f6ac 100644
if (!f)
return -errno;
@@ -1603,7 +1603,7 @@ int verify_timezone(const char *name, int log_level) {
@@ -1606,7 +1606,7 @@ int verify_timezone(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return -ENAMETOOLONG;
@@ -65,7 +65,7 @@ index 5dd00af952..b97a41f6ac 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0)
@@ -1675,7 +1675,7 @@ int get_timezone(char **ret) {
@@ -1678,7 +1678,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* Return EINVAL if not a symlink */
@@ -75,7 +75,7 @@ index 5dd00af952..b97a41f6ac 100644
return -EINVAL;
if (!timezone_is_valid(e, LOG_DEBUG))
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index ae1899593c..20d3071114 100644
index ba96a749c6..f64e22faf1 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -584,7 +584,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) {
@@ -103,7 +103,7 @@ index ae1899593c..20d3071114 100644
return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 84e94e845a..8e1f1a6ea2 100644
index d9bde47c8e..8c32e3ae99 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1856,8 +1856,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
@@ -118,7 +118,7 @@ index 84e94e845a..8e1f1a6ea2 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 43cf3fddb9..dc23550500 100644
index 5478666ca0..7e2ea196f5 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -268,7 +268,7 @@ static int context_read_data(Context *c) {

4
pkgs/os-specific/linux/systemd/default.nix
View File

@@ -201,13 +201,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
inherit pname;
version = "260.4";
version = "260.5";
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd";
rev = "v${finalAttrs.version}";
hash = "sha256-n+wzn+1W82YooRxzIEJHm4CsVPFBGlQUIy9TatxlbaU=";
hash = "sha256-QLQad4pKkaf99k+ABOaooKi5TSX0iHH9XtMn/fy1rfE=";
};
# PATCH POLICY