Skip to content

Commit

Permalink
cryptonite -> crypton
Browse files Browse the repository at this point in the history
  • Loading branch information
sorki committed Jan 4, 2024
1 parent 6685db0 commit 2153abf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
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 qualified Data.Text as Text
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
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

0 comments on commit 2153abf

Please sign in to comment.