diff options
| author | Alan Pearce | 2020-08-24 09:52:20 +0200 |
|---|---|---|
| committer | Alan Pearce | 2020-08-24 10:03:01 +0200 |
| commit | efc4a4f62392ee31dbd74c008f5de7162d8add20 (patch) | |
| tree | 2df61d296b20f36a164de608418edbc7292ac776 | |
| parent | bcb93216495a987dffd8e1626b0704a3ef5e7e29 (diff) | |
| download | nixfiles-efc4a4f62392ee31dbd74c008f5de7162d8add20.tar.lz nixfiles-efc4a4f62392ee31dbd74c008f5de7162d8add20.tar.zst nixfiles-efc4a4f62392ee31dbd74c008f5de7162d8add20.zip | |
Enable cross-platform use of unstable channel
| -rw-r--r-- | user/settings/nixpkgs.nix | 5 | ||||
| -rw-r--r-- | user/settings/satoshipay.nix | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/user/settings/nixpkgs.nix b/user/settings/nixpkgs.nix index 364d2020..0463596b 100644 --- a/user/settings/nixpkgs.nix +++ b/user/settings/nixpkgs.nix @@ -1,5 +1,9 @@ { config, pkgs, ... }: +let + inherit (pkgs) stdenv; + unstablePkgs = if stdenv.isDarwin then import <nixpkgs-unstable> {} else import <nixos-unstable> {}; +in { imports = [ ./nix.nix @@ -8,6 +12,7 @@ (self: super: { firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; }; firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; }; + unstable = unstablePkgs; }) ]; } diff --git a/user/settings/satoshipay.nix b/user/settings/satoshipay.nix index 6a1adb70..ac33508b 100644 --- a/user/settings/satoshipay.nix +++ b/user/settings/satoshipay.nix @@ -2,7 +2,6 @@ let inherit (pkgs) stdenv; - unstablePkgs = if !stdenv.isDarwin then import <nixos-unstable> {} else {}; spGitConfig = { user.email = "alan@satoshipay.io"; }; @@ -37,7 +36,7 @@ in docker_compose redis-desktop-manager - unstablePkgs.ripcord + unstable.ripcord robo3t ])); |