Merge branch 'master' into string

Author: Anton-Latukha

.github/workflows/Cabal-Linux.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: [ "8.10", "8.6" ]
+        ghc: [ "9.0", "8.8" ]
     steps:
 
       - name: "Git checkout"
@@ -62,9 +62,9 @@ jobs:
         run: cabal v2-test $cabalConfig
 
       - name: "Haddock"
-        if: ${{ matrix.ghc == '8.10' }}
+        if: ${{ matrix.ghc == '9.0' }}
         run: cabal v2-haddock $cabalConfig
 
       - name: "Source distribution file"
-        if: ${{ matrix.ghc == '8.10' }}
+        if: ${{ matrix.ghc == '9.0' }}
         run: cabal v2-sdist

.github/workflows/Cabal-macOS.yml

@@ -15,11 +15,11 @@ jobs:
 
   build10:
     name: "GHC"
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         # It is dev env, so trying to stick to last GHC.
-        ghc: [ "8.10" ]
+        ghc: [ "9.0" ]
     steps:
 
       - name: "Git checkout"

.github/workflows/On-Release-Cabal-Linux.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         # Since CI by default tests boundary GHCs, test middle versions of GHCs
-        ghc: [ "8.8" ]
+        ghc: [ "9.0" ]
     steps:
       - name: "Git checkout"
         uses: actions/checkout@v2

ChangeLog.md

@@ -1,7 +1,45 @@
 
 # ChangeLog
 
-## [(diff)](https://github.com/haskell-nix/hnix/compare/0.13.1...master#files_bucket) WIP
+## [(diff)](https://github.com/haskell-nix/hnix/compare/0.14.0...0.15.0#files_bucket) 0.15.0
+
+Partial log (for now):
+
+* Breaking:
+
+  * `Nix.Expr.Shorthands`:
+    * `inherit{,From}`: dropped second argument as irrelevant ([report](https://github.com/haskell-nix/hnix/issues/326)).
+    * `mkAssert`: fixed ([report](https://github.com/haskell-nix/hnix/issues/969)).
+    * fx presedence between the operators:
+        
+        ```haskell
+        (@@), (@.), (@./), ($==), ($!=), ($<), ($<=), ($>), ($>=), ($&&), ($||), ($->), ($//), ($+), ($-), ($*), ($/), ($++), (==>)
+        ```
+        
+        Now these shorthands can be used without sectioning & so represent the Nix expressions one to one.
+        
+        ```haskell
+        nix = "           a/b   //            c/def   //           <g>  <             def/d"
+        hask = mkRelPath "a/b" $// mkRelPath "c/def" $// mkEnvPath "g" $<  mkRelPath "def/d"
+        ```
+
+* Additional
+  * `Nix.Expr.Shorthands`:
+    * `mkOper{,2}` entered deprecation, superceeded by new name `mkOp{,2}`.
+    * `mkBinop` entered deprecation, supeceeded by new name `mkBinop`.
+    * added `@.<|>` for Nix language `s.x or y` expession.
+    * add `mkNeg` number negation.
+
+
+## [(diff)](https://github.com/haskell-nix/hnix/compare/0.13.1...0.14.0#files_bucket) 0.14.0 (2021-07-08)
+
+* GHC 9.0 support.
+
+* HNix switched to pre-0.9 style of log (aka "no log"). We temporarily stopped producing log, choosing effectiveness over writing about it.
+
+* All changes seem trivial (from the inside). There is no changes in `Nix.Expr.Shorthands` module. Would there be difficulties in migration - please write to us - we would tackle & solve it togather.
+
+A partial log:
 
 * Breaking:
 

default.nix

@@ -93,7 +93,7 @@
 #   , nixos-20.03  # Last stable release, gets almost no updates to recipes, gets only required backports
 #   ...
 #   }
-, rev ? "65d6153aec85c8cb46023f0a7248628f423ca4ee"
+, rev ? "20887e4bbfdae3aed6bfa1f53ddf138ee325515e"
 
 , pkgs ?
     if builtins.compareVersions builtins.nixVersion "2.0" > 0
@@ -192,6 +192,8 @@ let
 
       semialign = super.semialign_1_2;
       relude = super.relude_1_0_0_1;
+      hnix-store-core = super.hnix-store-core_0_5_0_0;
+      hnix-store-remote = super.hnix-store-remote_0_5_0_0;
 
     };
 

hnix.cabal

@@ -1,6 +1,6 @@
 cabal-version:  2.2
 name:           hnix
-version:        0.13.1
+version:        0.14.0.1
 synopsis:       Haskell implementation of the Nix language
 description:    Haskell implementation of the Nix language.
 category:       System, Data, Nix
@@ -410,6 +410,7 @@ library
     , base16-bytestring >= 0.1.1 && < 1.1
     , binary >= 0.8.5 && < 0.9
     , bytestring >= 0.10.8 && < 0.12
+    , cryptonite
     , comonad >= 5.0.4 && < 5.1
     , containers >= 0.5.11.0 && < 0.7
     , data-fix >= 0.3.0 && < 0.4
@@ -422,8 +423,8 @@ library
     , gitrev >= 1.1.0 && < 1.4
     , hashable >= 1.2.5 && < 1.4
     , hashing >= 0.1.0 && < 0.2
-    , hnix-store-core >= 0.4.0 && < 0.5
-    , hnix-store-remote >= 0.4.0 && < 0.5
+    , hnix-store-core >= 0.5.0 && < 0.6
+    , hnix-store-remote >= 0.5.0 && < 0.6
     , http-client >= 0.5.14 && < 0.6 || >= 0.6.4 && < 0.8
     , http-client-tls >= 0.3.5 && < 0.4
     , http-types >= 0.12.2 && < 0.13