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: 9df6083b720b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8352653ac97
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 9, 2019

  1. sad: Fix build

    @infinisil
    infinisil committed Mar 9, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 916062A1C4748647
    Learn about vigilant mode
    Copy the full SHA
    8ca1c92 View commit details

  2. Merge pull request #57098 from Infinisil/fix/sad 

    sad: Fix build
    @Ma27
    Ma27 authored Mar 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b835265 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/science/logic/sad/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/sad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, spass }:
{ stdenv, fetchurl, haskell, spass }:

stdenv.mkDerivation {
name = "system-for-automated-deduction-2.3.25";
src = fetchurl {
url = "http://nevidal.org/download/sad-2.3-25.tar.gz";
sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
};
buildInputs = [ ghc spass ];
buildInputs = [ haskell.compiler.ghc844 spass ];
patches = [
./patch
# Since the LTS 12.0 update, <> is an operator in Prelude, colliding with