From 8eadbcc0872800cf852fa43a017eaed4f4eba5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Sun, 3 Jul 2022 18:50:30 +0100
Subject: [PATCH] add latest thunderbird

---
 flake.lock                   | 17 +++++++++++++++++
 flake.nix                    | 10 +++++++++-
 nixos/distributed-builds.nix |  2 +-
 nixos/gui/default.nix        |  6 ++++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index a31b76b9..21ecdfa2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,6 +106,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1656856966,
+        "narHash": "sha256-pD09eSy4eWAVvAawBFyQRmPjdmyJzDO8J/zLpikxgEw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "73fbb75a9061d4cee01390b40f16eda2bbae1462",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-nixos-unstable": {
       "locked": {
         "lastModified": 1656753965,
@@ -160,6 +176,7 @@
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index f4260b54..2285a91f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,8 @@
 {
   description = "NixOS configuration with flakes";
   outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable
-    , nixpkgs-stable, darwin, nixos-hardware, nur, sops, }@inputs:
+    , nixpkgs-master, nixpkgs-stable, darwin, nixos-hardware, nur, sops,
+    }@inputs:
 
     let
       mkServer = pkgs: system: hostname:
@@ -154,6 +155,13 @@
       };
     };
   inputs = {
+    nixpkgs-master = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "master";
+    };
+
     nixpkgs-nixos-unstable = {
       type = "github";
       owner = "NixOS";
diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix
index ddf41672..2c035a8f 100644
--- a/nixos/distributed-builds.nix
+++ b/nixos/distributed-builds.nix
@@ -11,7 +11,7 @@
       systems = [ "x86_64-linux" "aarch64-linux" ];
       maxJobs = 2;
       speedFactor = 1;
-      supportedFeatures = [ "kvm" ];
+      supportedFeatures = [ "kvm" "big-parallel" ];
       mandatoryFeatures = [ ];
     }
     {
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index c5b8409f..f19f3b47 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -1,5 +1,7 @@
 { config, pkgs, discord, inputs, nixpkgs-nixos-unstable-and-unfree, ... }:
-let unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
+let
+  unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system};
+  nixpkgs-master = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
 in {
   programs.firejail.enable = true;
   programs.firejail.wrappedBinaries = {
@@ -77,7 +79,7 @@ in {
         yubikey-manager-qt
         yubikey-personalization
         yubikey-personalization-gui
-      ] ++ [ unstable.gnucash ] ++ [
+      ] ++ [ unstable.gnucash nixpkgs-master.thunderbird ] ++ [
         nixpkgs-nixos-unstable-and-unfree.discord
         nixpkgs-nixos-unstable-and-unfree.hopper
         nixpkgs-nixos-unstable-and-unfree.slack