temporary: Drop workarounds for previous upstream version

This commit is contained in:
Tyson Whitehead
2021-01-20 19:33:37 -05:00
parent e15bd037d4
commit c6c75bb897

View File

@@ -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; };