Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1bfafdfe65df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ba63d0b05dd
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 18, 2017

  1. proofgeneral_HEAD: fix for files removed upstream

    @Ptival
    Ptival committed May 18, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    eaef55f View commit details

Commits on May 21, 2017

  1. Merge pull request #25905 from Ptival/proofgeneral-head 

    proofgeneral_HEAD: fix
    @joachifm
    joachifm authored May 21, 2017
    Copy the full SHA
    3ba63d0 View commit details
Showing with 0 additions and 21 deletions.
  1. +0 −5 pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
  2. +0 −16 pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
5 changes: 0 additions & 5 deletions pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
View file
Original file line number Diff line number Diff line change
@@ -18,16 +18,11 @@ stdenv.mkDerivation (rec {
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
sed -i "bin/proofgeneral" -e's/which/type -p/g'
# @image{ProofGeneral} fails, so remove it.
sed -i '94d' doc/PG-adapting.texi
sed -i '96d' doc/ProofGeneral.texi
'';

patches = [ ./pg.patch ];

preBuild = ''
make clean;
'';
16 changes: 0 additions & 16 deletions pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
View file

This file was deleted.