pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

wip: prevent element-desktop & signal-desktop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
from segfaulting by using the version from nixos-22.11

It seems the electron version bundled with those pkgs from
nixos-unstable is indeed unstable when used via overlays
This commit is contained in:
teutat3s 2023-03-14 14:30:03 +01:00
parent a3a9fd5414
commit c8adc5cc0c
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
flake.lock
View file

@ -324,11 +324,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1678111249, "lastModified": 1678654296,
"narHash": "sha256-ZTIbK7vthZwti5XeLZE+twkb4l44q01q2XoLMmmJe94=", "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a028e2873d7fcf44e66b784b4ba061824315537f", "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +400,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1678072060, "lastModified": 1678703398,
"narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=", "narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560", "rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -489,6 +489,22 @@
"type": "indirect" "type": "indirect"
} }
}, },
"pr": {
"locked": {
"lastModified": 1678685944,
"narHash": "sha256-cjpGo5AhuLt2JBeI59SLdx5PRS3EEAgFVXzUpbSpEjo=",
"owner": "equirosa",
"repo": "nixpkgs",
"rev": "5b79e022238bc158b36bba0502f643aeb43064a0",
"type": "github"
},
"original": {
"owner": "equirosa",
"ref": "backport-signal-desktop-to-release-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -505,6 +521,7 @@
"nixos-22-05": "nixos-22-05", "nixos-22-05": "nixos-22-05",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur", "nur": "nur",
"pr": "pr",
"triton-vmtools": "triton-vmtools", "triton-vmtools": "triton-vmtools",
"tritonshell": "tritonshell" "tritonshell": "tritonshell"
} }

1
flake.nix
View file

@ -12,6 +12,7 @@
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
master.url = "github:nixos/nixpkgs/master"; master.url = "github:nixos/nixpkgs/master";
fork.url = "github:teutat3s/nixpkgs/fix/qMasterPassword-styles"; fork.url = "github:teutat3s/nixpkgs/fix/qMasterPassword-styles";
pr.url = "github:equirosa/nixpkgs/backport-signal-desktop-to-release-22.11";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;

7
overlays/overrides.nix
View file

@ -6,12 +6,10 @@ channels: final: prev: {
cachix cachix
dhall dhall
discord discord
element-desktop
rage rage
nix-index nix-index
qutebrowser qutebrowser
alejandra alejandra
signal-desktop
starship starship
deploy-rs deploy-rs
tdesktop tdesktop
@ -27,6 +25,11 @@ channels: final: prev: {
#inherit (channels.master) #inherit (channels.master)
# ; # ;
inherit
(channels.pr)
signal-desktop
;
inherit inherit
(channels.fork) (channels.fork)
qMasterPassword qMasterPassword