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

support for patched versions of nixpkgs

Browse source
This commit is contained in:
Julien Malka 2023-08-18 12:02:38 +02:00
parent 56ea69644d
commit 05b6b21788
Signed by: Luj
GPG key ID: 6FC74C847011FD83
5 changed files with 83 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -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",

2
flake.nix
View file

@ -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";

17
lib/default.nix
View file

@ -3,10 +3,19 @@ inputs: final: prev:
with builtins;
let
overlay-unstable = arch: final: prev: {
unstable = inputs.unstable.legacyPackages."${arch}";
stable = inputs.nixpkgs.legacyPackages."${arch}";
};
overlay-unstable = arch: final: prev:
let
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
{

4
machines/x2100/home-julien.nix
View file

@ -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;

48
patches/signal.patch Normal file
View file

@ -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";
};
}