Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5380ae73637
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24bab875204f
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 15, 2018

  1. haskellPackages.cryptonite: re-enable tests. 

    This has been fixed since cryptonite-0.7:

haskell-crypto/cryptonite#28

cryptonite is also no longer listed in expected-test-failures in
Stackage.

(cherry picked from commit c8a59e8)
Backport of #48485
    @dhess @srhb
    dhess authored and srhb committed Oct 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fbb068d View commit details

  2. haskellPackages.cryptonite: fix for aarch64. 

    This is a cherry-pick from upstream (see
haskell-crypto/cryptonite#234); there has
been no upstream release since the fix was committed.

(cherry picked from commit 321626d)
Backport of #48485
    @dhess @srhb
    dhess authored and srhb committed Oct 15, 2018
    Copy the full SHA
    67a7354 View commit details

  3. Merge pull request #48486 from srhb/backport-48485 

    Backport 18.09: haskellPackages.cryptonite: fix for aarch64 and re-enable tests
    @srhb
    srhb authored Oct 15, 2018
    Copy the full SHA
    24bab87 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/haskell-modules/configuration-common.nix
9 changes: 7 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -675,8 +675,13 @@ self: super: {
# https://github.com/goldfirere/singletons/issues/122
singletons = dontCheck super.singletons;

# https://github.com/fpco/stackage/issues/838
cryptonite = dontCheck super.cryptonite;
# Fix an aarch64 issue with cryptonite-0.25:
# https://github.com/haskell-crypto/cryptonite/issues/234
# This has been committed upstream, but there is, as of yet, no new release.
cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch {
url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch;
sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq";
});

# We cannot build this package w/o the C library from <http://www.phash.org/>.
phash = markBroken super.phash;