Compare commits

..

No commits in common. "95f3aa39c8986f3973666c1a07289ac0167df5da" and "7b07ae798399b425840557c920ead28d2cf263c1" have entirely different histories.

3 changed files with 13 additions and 21 deletions

View File

@ -263,7 +263,8 @@
atool-wrapped = packages.atool;
};
zen-browser-overlay = final: prev: let
zen-browser-overlay = final: prev:
let
inherit (final) system callPackage;
input = inputs.zen-browser;
@ -271,14 +272,11 @@
sources = builtins.fromJSON (builtins.readFile (input + "/sources.json"));
warnExists = name: value: let
pass =
if prev ? ${name}
then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value
else value;
in
pass;
in {
zen-browser-bin = callPackage packages.zen-browser.override {};
pass = if prev ? ${name} then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value else value;
in pass;
in
{
zen-browser-bin = callPackage packages.zen-browser.override { };
zen-browser-unwrapped = warnExists "zen-browser-unwrapped" (callPackage packages.zen-browser-unwrapped.override {
inherit (sources.${system}) hash url;
inherit (sources) version;

View File

@ -7,6 +7,10 @@
...
}: let
cfg = config.nixfiles.packageSets.communication;
rustdesk-pkg =
if (lib.strings.hasInfix "23.11" lib.version)
then inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.rustdesk-flutter
else pkgs.rustdesk-flutter;
vesktop-ozone-cmd = let
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
@ -48,7 +52,7 @@ in {
signal-desktop
thunderbird
vesktop
rustdesk-flutter
rustdesk-pkg
tor-browser
onionshare
]

View File

@ -9,10 +9,7 @@
# not high priority, this still works well for this overlay.
nixfiles = self;
overlay = final: prev: let
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {
inherit (prev) system;
config.allowUnfree = true;
};
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {inherit (prev) system;};
updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
inherit (final) callPackage fetchFromGitHub;
@ -87,13 +84,6 @@
inherit (prev) redlib;
in
pickNewer redlib-new redlib;
rustdesk-flutter = let
stable = pkgsStable.rustdesk-flutter;
unstable = prev.rustdesk-flutter;
now = 1741899501;
in
hold now 7 stable unstable;
}
// (
lib.genAttrs [