From 33c2a27d775ab63e9ad239f9058bc8097fbfd445 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 1 Mar 2020 01:06:00 +0000 Subject: chore(third_party): Remove pounce override Pounce is now available at 1.1 from nixpkgs upstream and no longer needs to be bumped manually. --- third_party/default.nix | 3 ++- third_party/pounce/default.nix | 17 ----------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 third_party/pounce/default.nix (limited to 'third_party') diff --git a/third_party/default.nix b/third_party/default.nix index 2cf6d13cd24e..cb0233c9e60f 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -79,6 +79,7 @@ let pandoc parallel pkgconfig + pounce protobuf python3Packages remarshal @@ -117,7 +118,7 @@ in exposed // { # Packages to be overridden originals = { - inherit (nixpkgs) git guile notmuch pounce; + inherit (nixpkgs) git guile notmuch; }; # Make NixOS available diff --git a/third_party/pounce/default.nix b/third_party/pounce/default.nix deleted file mode 100644 index 6e4feffe7cea..000000000000 --- a/third_party/pounce/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# 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; - -originals.pounce.overrideAttrs(old: rec { - version = "1.1"; - src = fetchzip { - url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "07iyh6ikrlf7y57k462jcr00db6aijk9b2s7n7l7i49hk7kmm6wq"; - }; - - patches = []; -}) -- cgit 1.4.1