Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-04 11:10:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

patches

Browse source
This commit is contained in:
Julien Malka 2023-09-17 20:47:51 +02:00
parent 9f9327b7a5
commit 84a0969ccb
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
patches/bcachefs-systemd-stage-1.patch
View file

@ -1,18 +1,9 @@
From e6e285cd201e5de2f36ce7f3efacd224a73c96a0 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 16 Aug 2023 17:02:28 +0200
Subject: [PATCH 1/2] bcachefs: support unlocking in systemd-based stage1
---
nixos/modules/tasks/filesystems/bcachefs.nix | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index 19ef188ce7833..6a45a53e9b1cc 100644 index 851c09781339..6e5adb2a64c5 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix --- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -70,6 +70,32 @@ in @@ -63,6 +63,32 @@ in
"mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs"; '';
}; };
+ boot.initrd.systemd.services = lib.mapAttrs' (mountpoint: fileSystem: let + boot.initrd.systemd.services = lib.mapAttrs' (mountpoint: fileSystem: let
@ -43,21 +34,9 @@ index 19ef188ce7833..6a45a53e9b1cc 100644
+ +
boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs '';
From 6d194a0b0248658f1e2d4fd354ce884bd81d5fa6 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 24 Aug 2023 00:48:52 +0200
Subject: [PATCH 2/2] nixos/tests/installer: test bcachefs root with systemd
stage1
---
nixos/tests/installer-systemd-stage-1.nix | 2 ++
nixos/tests/installer.nix | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix
index 85155a6c682b3..8f10a461d1c6c 100644 index 03f0ec8d746b..69c19f089e4c 100644
--- a/nixos/tests/installer-systemd-stage-1.nix --- a/nixos/tests/installer-systemd-stage-1.nix
+++ b/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
@ -70,10 +49,10 @@ index 85155a6c682b3..8f10a461d1c6c 100644
btrfsSubvolDefault btrfsSubvolDefault
btrfsSubvolEscape btrfsSubvolEscape
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 56ba85b76e6f5..3ad36f22f3a95 100644 index 590988d95986..027153ed31ec 100644
--- a/nixos/tests/installer.nix --- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix
@@ -918,7 +918,7 @@ in { @@ -916,7 +916,7 @@ in {
enableOCR = true; enableOCR = true;
preBootCommands = '' preBootCommands = ''
machine.start() machine.start()

31
patches/signal.patch
View file

@ -1,17 +1,8 @@
From 08715717912f84e2b17b191c2e8f23151c7df877 Mon Sep 17 00:00:00 2001
From: Morantoine <71721545+Morantoine@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:23:23 +0200
Subject: [PATCH 1/2] signal-desktop: 6.27.1 -> 6.28.0
---
.../networking/instant-messengers/signal-desktop/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index ea1ab235fc466..5e9119b08f7d2 100644 index ea1ab235fc46..311ff2669327 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,8 +1,8 @@ @@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = { signal-desktop = {
dir = "Signal"; dir = "Signal";
@ -22,24 +13,6 @@ index ea1ab235fc466..5e9119b08f7d2 100644
}; };
signal-desktop-beta = { signal-desktop-beta = {
dir = "Signal Beta"; dir = "Signal Beta";
From 49118d1f8435e33c13487bc2d8bd7528b46e7eb3 Mon Sep 17 00:00:00 2001
From: Morantoine <71721545+Morantoine@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:24:01 +0200
Subject: [PATCH 2/2] signal-desktop-beta: 6.24.0-beta.1 -> 6.29.0-beta.1
---
.../networking/instant-messengers/signal-desktop/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 5e9119b08f7d2..311ff26693275 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -6,7 +6,7 @@
};
signal-desktop-beta = {
dir = "Signal Beta";
- version = "6.24.0-beta.1"; - version = "6.24.0-beta.1";
- hash = "sha256-tA1xsgtAeOn0c0HcZutj+Pqrsr0JV5bQOnknH4t/QkY="; - hash = "sha256-tA1xsgtAeOn0c0HcZutj+Pqrsr0JV5bQOnknH4t/QkY=";
+ version = "6.29.0-beta.1"; + version = "6.29.0-beta.1";