Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cryptonite -> crypton #1104

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

# ChangeLog

## [(diff)](https://github.com/haskell-nix/hnix/compare/0.17.0...master#files_bucket) next

* Additional
* Switch from `cryptonite` to `crypton`

## [(diff)](https://github.com/haskell-nix/hnix/compare/0.16.0...0.17.0#files_bucket) 0.17.0

* Additional
Expand Down Expand Up @@ -29,7 +34,7 @@
* `wrapPath`
* In `Nix.Parser`:
* rm `get{App,Unary,Binary,Special}Operator`, currely `NOp` class instances are used instead.

* `Nix.Pretty`:
* [(link)](https://github.com/haskell-nix/hnix/pull/1047/files) rm `appOp`, instead use `appOpDef`.
* [(link)](https://github.com/haskell-nix/hnix/pull/1047/files) `precedenceWrap` behaviour is changed (to be literal to the name), the old behaviour is now a `wrap` function.
Expand Down
2 changes: 1 addition & 1 deletion hnix.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ library
, base16-bytestring >= 0.1.1 && < 1.1
, binary >= 0.8.5 && < 0.9
, bytestring >= 0.10.8 && < 0.12
, cryptonite
, crypton >= 0.34
, comonad >= 5.0.4 && < 5.1
, containers >= 0.5.11.0 && < 0.7
, deepseq >= 1.4.3 && <1.6
Expand Down
4 changes: 2 additions & 2 deletions src/Nix/Effects.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{-# language DataKinds #-}
{-# language GeneralizedNewtypeDeriving #-}
{-# language UndecidableInstances #-}
{-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
{-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, crypton}@
{-# language TypeOperators #-}

{-# options_ghc -Wno-orphans #-}
Expand All @@ -23,7 +23,7 @@
import Network.HTTP.Client hiding ( path, Proxy )
import Network.HTTP.Client.TLS
import Network.HTTP.Types
import qualified "cryptonite" Crypto.Hash as Hash
import qualified "crypton" Crypto.Hash as Hash
import Nix.Utils.Fix1
import Nix.Expr.Types.Annotated
import Nix.Frames hiding ( Proxy )
Expand Down Expand Up @@ -416,7 +416,7 @@
(\ err -> pure $ Left $ ErrorCall $ "String '" <> show name <> "' is not a valid path name: " <> err)
(\ pathName ->
do
res <- Store.Remote.runStore $ Store.Remote.addToStore @Hash.SHA256 pathName (toNarSource content) recursive repair

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (8.8)

• No instance for (System.Nix.Internal.Hash.NamedAlgo Hash.SHA256)

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (9.6)

• No instance for ‘System.Nix.Internal.Hash.NamedAlgo Hash.SHA256’

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (9.0)

• No instance for (System.Nix.Internal.Hash.NamedAlgo Hash.SHA256)

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (9.2)

• No instance for (System.Nix.Internal.Hash.NamedAlgo Hash.SHA256)

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (9.4)

• No instance for (System.Nix.Internal.Hash.NamedAlgo Hash.SHA256)

Check failure on line 419 in src/Nix/Effects.hs

View workflow job for this annotation

GitHub Actions / GHC (9.6)

• No instance for ‘System.Nix.Internal.Hash.NamedAlgo Hash.SHA256’
either
Left -- err
(pure . toStorePath) -- store path
Expand Down
4 changes: 2 additions & 2 deletions src/Nix/Effects/Derivation.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# language DataKinds #-}
{-# language NamedFieldPuns #-}
{-# language RecordWildCards #-}
{-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, cryptonite}@
{-# language PackageImports #-} -- 2021-07-05: Due to hashing Haskell IT system situation, in HNix we currently ended-up with 2 hash package dependencies @{hashing, crypton}@

module Nix.Effects.Derivation ( defaultDerivationStrict ) where

Expand All @@ -21,7 +21,7 @@ import qualified Data.Text as Text
import Text.Megaparsec
import Text.Megaparsec.Char

import qualified "cryptonite" Crypto.Hash as Hash -- 2021-07-05: Attrocity of Haskell hashing situation, in HNix we ended-up with 2 hash package dependencies @{hashing, cryptonite}@
import qualified "crypton" Crypto.Hash as Hash -- 2021-07-05: Attrocity of Haskell hashing situation, in HNix we ended-up with 2 hash package dependencies @{hashing, crypton}@

import Nix.Atoms
import Nix.Expr.Types hiding ( Recursive )
Expand Down
Loading