remove warning, switch to mozilla nixpkgs

.ci/srht-job.yaml

@@ -7,6 +7,9 @@ secrets:
 environment:
   CI_BUILD: "sr.ht"
 tasks:
+  - flake-update: |
+      cd flake-firefox-nightly
+      nix-shell -I 'https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz' -p nixUnstable --command "nix --experimental-features 'nix-command flakes' flake update --recreate-lock-file --no-registries"
   - prep: |
       cd flake-firefox-nightly
       nix-shell --pure --command "./.ci/prep.sh"

README.md

@@ -10,9 +10,7 @@ otherwise is not so possbile)
 
 # Warnings
 
-1. This uses my fork of nixpkgs-mozilla, pending this PR: https://github.com/mozilla/nixpkgs-mozilla/pull/230
-
-2. The structures of outputs of the flake may change when I update to export more of the
+1. The structures of outputs of the flake may change if/when I update to export more of the
    firefox-overlay ouputs. (a breaking change for users potentially)
 
 # Security Warning

flake.nix

@@ -5,8 +5,8 @@
   inputs = {
     nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; };
     cmpkgs = { url = "github:colemickens/nixpkgs/cmpkgs"; };# TODO: remove
-    cachixpkgs = { url = "github:nixos/nixpkgs/nixos-20.09"; };
-    mozilla = { url = "github:colemickens/nixpkgs-mozilla"; flake = false; };
+    cachix = { url = "github:nixos/nixpkgs/nixos-20.09"; };
+    mozilla = { url = "github:mozilla/nixpkgs-mozilla"; flake = false; };
   };
 
   outputs = inputs:
@@ -45,7 +45,7 @@
       devShell = forAllSystems (system:
         pkgs_.nixpkgs.${system}.mkShell {
           nativeBuildInputs = []
-            ++ (with pkgs_.cachixpkgs.${system}; [ cachix ])
+            ++ (with pkgs_.cachix.${system}; [ cachix ])
             ++ (with pkgs_.nixpkgs.${system}; [ bash cacert curl git jq mercurial openssh ripgrep ])
             ++ (with pkgs_.cmpkgs.${system}; [ nixUnstable nix-prefetch nix-build-uncached ])
           ;