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: 740b238c7d0b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f2f9447d74e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 13, 2019

  1. tasty-tap: fix tests 

    - The golden test for tasty-tap is out-of-date with the current TAP
  format. An issue has been submitted upstream here:
  MichaelXavier/tasty-tap#2.
- I've created a pull request that makes the (minor) changes to the
  golden test file and applied the patch for that pull request here.
- Remove tasty-tap from broken-packages
    @sevanspowell
    sevanspowell committed Oct 13, 2019
    Copy the full SHA
    1e40b69 View commit details

Commits on Oct 14, 2019

  1. Merge pull request #71017 from sevanspowell/feature/fix-tasty-tap-tests 

    tasty-tap: fix tests
    @peti
    peti authored Oct 14, 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
    5f2f944 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
7 changes: 7 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1254,4 +1254,11 @@ self: super: {
# https://github.com/bitnomial/prometheus/issues/34
prometheus = doJailbreak super.prometheus;

# Tasty-tap tests are out-of-date with TAP format
# https://github.com/MichaelXavier/tasty-tap/issues/2
tasty-tap = appendPatch super.tasty-tap (pkgs.fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/MichaelXavier/tasty-tap/pull/3.diff;
sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv";
});

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -9347,7 +9347,6 @@ broken-packages:
- tasty-laws
- tasty-lens
- tasty-stats
- tasty-tap
- Taxonomy
- TaxonomyTools
- TBC