From c6c75bb8970047a87913b414cb465dcf4f573e86 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Wed, 20 Jan 2021 19:33:37 -0500
Subject: [PATCH] temporary: Drop workarounds for previous upstream version

---
 temporary/all-packages.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/temporary/all-packages.nix b/temporary/all-packages.nix
index cae2f3f..abff3c9 100644
--- a/temporary/all-packages.nix
+++ b/temporary/all-packages.nix
@@ -17,26 +17,11 @@ self: super: pkgs: with pkgs; {
     ];
   } );
 
-  # https://github.com/NixOS/nixpkgs/pull/82946
-  ninja = super.ninja.overrideAttrs ( attrs: {
-    patches = builtins.map ( patch:
-        patch.overrideAttrs ( attrs: {
-          urls = builtins.map ( src:
-              if src == https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch
-              then https://github.com/ninja-build/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch
-              else src )
-            attrs.urls;
-        } ) )
-      attrs.patches;
-  } );
-
   # https://github.com/NixOS/nixpkgs/issues/38459
   octave = super.octave.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [ gl2ps ];
   } );
 
-  gl2ps = callPackage ./gl2ps.nix { };
-
   # https://github.com/NixOS/nixpkgs/issues/44426
   python27 = super.python27.override { packageOverrides = pythonOverrides; };
   python35 = super.python35.override { packageOverrides = pythonOverrides; };