support for patched versions of nixpkgs

flake.lock

@@ -483,6 +483,22 @@
         "type": "github"
       }
     },
+    "master": {
+      "locked": {
+        "lastModified": 1692352441,
+        "narHash": "sha256-cRx7uE6BQSW27WvnHqfuR5PIUvRXBftwqCKvRRMQN0w=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0b1525114a2a9bc8eeee774fec9e7b0f1b1e543c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0b1525114a2a9bc8eeee774fec9e7b0f1b1e543c",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -754,6 +770,7 @@
         "hyprpaper": "hyprpaper",
         "lanzaboote": "lanzaboote",
         "linkal": "linkal",
+        "master": "master",
         "nix-index-database": "nix-index-database",
         "nix-rfc-92": "nix-rfc-92",
         "nixd": "nixd",

flake.nix

@@ -17,6 +17,8 @@
 
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
+    master.url = "github:NixOS/nixpkgs/0b1525114a2a9bc8eeee774fec9e7b0f1b1e543c";
+
     flake-utils.url = "github:numtide/flake-utils";
 
     colmena.url = "github:zhaofengli/colmena";

lib/default.nix

@@ -3,10 +3,19 @@ inputs: final: prev:
 with builtins;
 
 let
-  overlay-unstable = arch: final: prev: {
+  overlay-unstable = arch: final: prev:
-    unstable = inputs.unstable.legacyPackages."${arch}";
+    let
-    stable = inputs.nixpkgs.legacyPackages."${arch}";
+      master-patched-src = (import inputs.master { system = arch; }).applyPatches {
-  };
+        name = "nixpkgs-patches";
+        src = inputs.master;
+        patches = [ ../patches/signal.patch ];
+      };
+    in
+    {
+      unstable = inputs.unstable.legacyPackages."${arch}";
+      master-patched = import master-patched-src { system = arch; };
+      stable = inputs.nixpkgs.legacyPackages."${arch}";
+    };
 in
 {
 

machines/x2100/home-julien.nix

@@ -66,7 +66,7 @@
           step-cli
           coq
           cvc5
-          signal-desktop
+          master-patched.signal-desktop-beta
           coqPackages.coqide
           (why3.withProvers
             [
@@ -74,6 +74,8 @@
               alt-ergo
               z3
             ])
+          libsForQt5.neochat
+
         ];
 
       fonts.fontconfig.enable = true;

patches/signal.patch

@@ -0,0 +1,48 @@
+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
+index ea1ab235fc466..5e9119b08f7d2 100644
+--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
++++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+@@ -1,8 +1,8 @@
+ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
+   signal-desktop = {
+     dir = "Signal";
+-    version = "6.27.1";
+-    hash = "sha256-nEOt6bep6SqhAab8yD9NlRrDGU2IvZeOxSqPj2u1bio=";
++    version = "6.28.0";
++    hash = "sha256-zJURX5VygBvW+0v29xqOx9HmQgFgfAbxoacd7ex3iec";
+   };
+   signal-desktop-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";
+-    hash = "sha256-tA1xsgtAeOn0c0HcZutj+Pqrsr0JV5bQOnknH4t/QkY=";
++    version = "6.29.0-beta.1";
++    hash = "sha256-ZUM2tVZbWtiatpI0ogo0MC6q8DIoPEBocIHuszx3Mv0";
+   };
+ }