teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

qMasterPassword Qt styles fix got backported

Browse source
This commit is contained in:
teutat3s 2023-03-22 09:33:25 +01:00
parent 4d4bf4abc6
commit 76ec848b23
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
flake.lock
View file

@ -284,22 +284,6 @@
"type": "github" "type": "github"
} }
}, },
"fork": {
"locked": {
"lastModified": 1669056793,
"narHash": "sha256-xf4QnWQlZsQRVRL0mnjCKg11d92532619dFDIZiXHEc=",
"owner": "teutat3s",
"repo": "nixpkgs",
"rev": "4e2b7d7a929ffa4a63328a71853dabd99ed403ca",
"type": "github"
},
"original": {
"owner": "teutat3s",
"ref": "fix/qMasterPassword-styles",
"repo": "nixpkgs",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -324,11 +308,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1678898370, "lastModified": 1679172431,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac718d02867a84b42522a0ece52d841188208f2c", "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +384,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1678872516, "lastModified": 1679224734,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", "narHash": "sha256-1Ab3xY7Wgo1h1TNwRt6fp2XjV+KUo+hP1Bolh0KiDJs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", "rev": "eac7da7b519a5aefe92c33c90b4450a24ebe0ab3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,7 +480,6 @@
"deploy": "deploy", "deploy": "deploy",
"digga": "digga", "digga": "digga",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"fork": "fork",
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"master": "master", "master": "master",

2
flake.nix
View file

@ -11,7 +11,6 @@
nixos.url = "github:nixos/nixpkgs/nixos-22.11"; nixos.url = "github:nixos/nixpkgs/nixos-22.11";
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";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;
@ -82,7 +81,6 @@
nixos-22-05 = {}; nixos-22-05 = {};
latest = {}; latest = {};
master = {}; master = {};
fork = {};
}; };
lib = import ./lib {lib = digga.lib // nixos.lib;}; lib = import ./lib {lib = digga.lib // nixos.lib;};

5
overlays/overrides.nix
View file

@ -25,11 +25,6 @@ channels: final: prev: {
#inherit (channels.master) #inherit (channels.master)
# ; # ;
inherit
(channels.fork)
qMasterPassword
;
inherit inherit
(channels.nixos-22-05) (channels.nixos-22-05)
terraform terraform