From f00500a8e6572b40488ee68c5fc3fb6c7b985ff0 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Thu, 27 Jan 2022 16:17:27 +0100 Subject: [PATCH] ADD unstable overlay FLAKE upd added unstable overlay to use unstable (latest) zoom client --- baseconfiguration.nix | 13 ++++++++++--- flake.lock | 18 +++++++++--------- users/ellmau/default.nix | 4 ++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/baseconfiguration.nix b/baseconfiguration.nix index 823348f..909bc6d 100644 --- a/baseconfiguration.nix +++ b/baseconfiguration.nix @@ -1,4 +1,12 @@ -{ pkgs, name, flakes, flakeOutputs, ...}: +{ pkgs, name, system, flakes, flakeOutputs, ...}: +let + overlay-unstable = final: prev: { + unstable = import flakes.nixpkgs-unstable { + system = "${system}"; + config.allowUnfree=true; + }; + }; +in { config, pkgs, lib, ...}: { imports = @@ -48,9 +56,8 @@ options = "--delete-older-than 30d"; }; }; - nixpkgs = { - overlays = [ flakes.emacs-overlay.overlay flakeOutputs.overlay ]; + overlays = [ flakes.emacs-overlay.overlay overlay-unstable flakeOutputs.overlay ]; config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "skypeforlinux" "teams" diff --git a/flake.lock b/flake.lock index 98f947e..9f8287f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1643079680, - "narHash": "sha256-2dS8LLdMgM+M9t3CEy4ehMo3bPH1coxSVfCuGlj1mms=", + "lastModified": 1643279442, + "narHash": "sha256-XfCXo2ji5te7sobk3sjLPEjxHZAjNFLCn/xBg7g3eWA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cae9afd0e907be25c65a7ad109815e9df839dd79", + "rev": "a0013418370c2493a3d3573cf51e10db8f44691f", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642961095, - "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=", + "lastModified": 1643247693, + "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c", + "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1642903813, - "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=", + "lastModified": 1643080866, + "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87", + "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d", "type": "github" }, "original": { diff --git a/users/ellmau/default.nix b/users/ellmau/default.nix index 44236fb..b3c8ba0 100644 --- a/users/ellmau/default.nix +++ b/users/ellmau/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ...}: +{ config, pkgs, lib, flakes, ...}: let withAliases = hostname: aliases: cfg: lib.recursiveUpdate @@ -42,7 +42,7 @@ in pkgs.jitsi-meet-electron pkgs.skypeforlinux pkgs.teams - pkgs.zoom-us + pkgs.unstable.zoom-us pkgs.element-desktop pkgs.signal-desktop ];