about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-03-01T01·06+0000
committerVincent Ambo <tazjin@google.com>2020-03-01T01·06+0000
commit33c2a27d775ab63e9ad239f9058bc8097fbfd445 (patch)
tree0a8f246f69414afc15381f4d949b675e2829e858 /third_party
parentd38995385b450c8b60f6a474574e61479ed74d5c (diff)
chore(third_party): Remove pounce override r/587
Pounce is now available at 1.1 from nixpkgs upstream and no longer
needs to be bumped manually.
Diffstat (limited to 'third_party')
-rw-r--r--third_party/default.nix3
-rw-r--r--third_party/pounce/default.nix17
2 files changed, 2 insertions, 18 deletions
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 = [];
-})