diff options
| -rw-r--r-- | ops/nixos/camden/default.nix | 9 | ||||
| -rw-r--r-- | third_party/default.nix | 9 | ||||
| -rw-r--r-- | third_party/pounce/default.nix | 17 |
3 files changed, 30 insertions, 5 deletions
diff --git a/ops/nixos/camden/default.nix b/ops/nixos/camden/default.nix index e177683dea8b..7c9c2a4c598d 100644 --- a/ops/nixos/camden/default.nix +++ b/ops/nixos/camden/default.nix @@ -90,11 +90,18 @@ in pkgs.lib.fix(self: { (with pkgs; [ third_party.git third_party.tailscale + third_party.pounce ]) ++ # programs from nixpkgs (with nixpkgs; [ - curl emacs26-nox gnupg pass pciutils direnv + curl + direnv + emacs26-nox + gnupg + htop + pass + pciutils ]); users = { diff --git a/third_party/default.nix b/third_party/default.nix index 193572bf65fb..5bd96581c9d8 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -5,11 +5,11 @@ { pkgs, ... }: let - # Tracking nixos-unstable as of 2020-01-18. - commit = "c438ce12a858f24c1a2479213eaab751da45fa50"; + # Tracking nixos-unstable as of 2020-02-17. + commit = "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2"; nixpkgsSrc = fetchTarball { url = "https://github.com/NixOS/nixpkgs-channels/archive/${commit}.tar.gz"; - sha256 = "18m4hxx8y0gfrmhkz29iyc0hmss584m9xhgpk7j7bwjaci0fps4z"; + sha256 = "154nrhmm3dk5kmga2w5f7a2l6j79dvizrg4wzbrcwlbvdvapdgkb"; }; nixpkgs = import nixpkgsSrc { config.allowUnfree = true; @@ -40,6 +40,7 @@ let emacsPackagesNgGen fetchFromGitHub fetchurl + fetchzip fira fira-code fira-mono @@ -110,7 +111,7 @@ in exposed // { # Packages to be overridden originals = { - inherit (nixpkgs) git guile notmuch; + inherit (nixpkgs) git guile notmuch pounce; }; # Make NixOS available diff --git a/third_party/pounce/default.nix b/third_party/pounce/default.nix new file mode 100644 index 000000000000..1aab276b7436 --- /dev/null +++ b/third_party/pounce/default.nix @@ -0,0 +1,17 @@ +# Applies the changes from nixpkgs#88e4258df to the pounce derivation. +# +# TODO(tazjin): Remove this once the change has propagated to +# nixos-unstable. +{ pkgs, ... }: + +with pkgs.third_party; + +originals.pounce.overrideAttrs(old: rec { + version = "1.1"; + src = fetchzip { + url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; + sha256 = "07iyh6ikrlf7y57k462jcr00db6aijk9b2s7n7l7i49hk7kmm6wq"; + }; + + patches = []; +}) |