From 383fbfadccaa12f908f79ab83f21fa5dbe10c6be Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Mar 2022 12:37:00 +0200 Subject: [PATCH 01/15] ghcWithPackages: use packageCfgDir over ghc.name where appropriate This is an incorrectness pointed out in #153319 which we already have a proper solution for. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7c7add61679d3..65a575e08e8a9 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -121,7 +121,7 @@ symlinkJoin { '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): - local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; + local packageConfDir="${packageCfgDir}"; local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir # Clean up the old links that may have been (transitively) included by @@ -148,8 +148,8 @@ symlinkJoin { # to another nix derivation, so they are not writable. Removing # them allow the correct behavior of ghc-pkg recache # See: https://github.com/NixOS/nixpkgs/issues/79441 - rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock - rm $out/lib/${ghc.name}/package.conf.d/package.cache + rm ${packageCfgDir}/package.cache.lock + rm ${packageCfgDir}/package.cache $out/bin/${ghcCommand}-pkg recache ''} From 78a93b5352a26bbbad4a9f22f0fcdaf76f5dc176 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Mar 2022 12:47:54 +0200 Subject: [PATCH 02/15] haskellPackages.mkDerivation: get ghclibdir via haskellCompilerName This is the correctest and clearest way to do it I can think of at the moment that doesn't need us to add anything. "${ghcCommand}-${ghc.version}" also works, but is clunkier and harder to replicate for downstream users. --- pkgs/development/haskell-modules/generic-builder.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 04973d3251e6e..f635331370307 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -195,13 +195,13 @@ let "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" - (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") + (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") ] ++ optionals stdenv.hasCC [ "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -274,6 +274,8 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; + ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; + nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; buildPkgDb = ghcName: packageConfDir: '' @@ -349,14 +351,14 @@ stdenv.mkDerivation ({ # pkgs* arrays defined in stdenv/setup.hs + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb nativeGhc.name "$setupPackageConfDir"} + ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '' # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghc.name "$packageConfDir"} + ${buildPkgDb ghcNameWithPrefix "$packageConfDir"} if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi @@ -493,7 +495,7 @@ stdenv.mkDerivation ({ # just the target specified; "install" will error here, since not all targets have been built. else '' ${setupCommand} copy ${buildTarget} - local packageConfDir="$out/lib/${ghc.name}/package.conf.d" + local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile From 456faf71e5a842128589e0b44dea3d426fa87e40 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Mar 2022 12:50:43 +0200 Subject: [PATCH 03/15] ghcWithPackages: use haskellCompilerName for ghclibdir This is done for consistency with generic-builder.nix and because it's easier for downstream users to replicate which will inevitably use our code as inspiration. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 65a575e08e8a9..c478c875540d1 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -51,7 +51,7 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghcCommand}-${ghc.version}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); From 6016ed50768d2ccc5417382970bb16948bc76c95 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 31 Mar 2022 12:53:40 +0200 Subject: [PATCH 04/15] treewide: replace uses of ghc.name to find packages' datadir --- nixos/modules/services/misc/gitit.nix | 2 +- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index ceb186c0f0492..87dd97166b8eb 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -10,7 +10,7 @@ let toYesNo = b: if b then "yes" else "no"; - gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.hostPlatform.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version; + gititShared = with cfg.haskellPackages; gitit + "/share/" + ghc.targetPrefix + ghc.haskellCompilerName + "/" + gitit.pname + "-" + gitit.version; gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self)); diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dfa47f2a82c57..809259da3ee5a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -613,7 +613,7 @@ self: super: { doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs]; postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir mkdir -p $data/share/emacs/site-lisp ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/ @@ -648,7 +648,7 @@ self: super: { # cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; @@ -659,7 +659,7 @@ self: super: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" ) + local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" ) mkdir -p $data/share/emacs ln -s $lispdir $data/share/emacs/site-lisp ''; From 76be6eaf29de81e7cdbad268e8f90106dcf021b5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 31 Mar 2022 13:48:17 +0200 Subject: [PATCH 05/15] haskell.compiler.ghc902: Backport -fcompact-unwind --- pkgs/development/compilers/ghc/9.0.2.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 04e29ed668616..0968b85399224 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -5,6 +5,7 @@ , autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr , autoSignDarwinBinariesHook , bash +, fetchpatch , libiconv ? null, ncurses , glibcLocales ? null @@ -182,6 +183,17 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2. + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423 + (fetchpatch { + name = "ghc-9.0.2-fcompact-unwind.patch"; + # Note that the test suite is not packaged. + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423"; + sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI="; + }) + ]; + postPatch = "patchShebangs ."; # GHC needs the locale configured during the Haddock phase. From 1d3b238d28f7f2035d5aea995fca8e6c552206a0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 31 Mar 2022 18:55:35 +0200 Subject: [PATCH 06/15] all-cabal-hashes: Set name Used to be just the hash from the basename, which was not informative when appearing in logs etc. --- pkgs/data/misc/hackage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e559281303d78..2e8c660d94727 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,10 +1,11 @@ # Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh # and callHackage -{ fetchurl }: +{ lib, fetchurl }: let pin = builtins.fromJSON (builtins.readFile ./pin.json); in fetchurl { inherit (pin) url sha256; + name = "all-cabal-hashes-${lib.substring 0 7 pin.commit}.tar.gz"; passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; } From 517cb71b026be805c41945dc86a7352b1bf8aa92 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 24 Dec 2021 21:12:56 +0100 Subject: [PATCH 07/15] haskellPackages.inline-c-cpp: Fix tests on darwin --- .../haskell-modules/configuration-darwin.nix | 2 -- .../haskell-modules/configuration-ghc-8.10.x.nix | 7 +++++++ .../haskell-modules/configuration-ghc-8.6.x.nix | 6 ++++++ .../haskell-modules/configuration-ghc-8.8.x.nix | 7 +++++++ .../haskell-modules/configuration-ghc-9.0.x.nix | 10 ++++++++++ .../haskell-modules/configuration-ghc-9.2.x.nix | 9 +++++++++ .../haskell-modules/configuration-ghc-head.nix | 9 +++++++++ 7 files changed, 48 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 84be174e97e8a..f8ae9807cd1d1 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -287,8 +287,6 @@ self: super: ({ # https://github.com/fpco/unliftio/issues/87 unliftio = dontCheck super.unliftio; - # https://github.com/fpco/inline-c/issues/127 - inline-c-cpp = dontCheck super.inline-c-cpp; # https://github.com/haskell-crypto/cryptonite/issues/360 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 0979466904479..84d0a30858f33 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -121,4 +125,7 @@ self: super: { ] super.mysql-simple; taffybar = markUnbroken (doDistribute super.taffybar); + + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index d712ab9d1a2b1..5eaa1ae413d47 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -104,4 +108,6 @@ self: super: { mime-string = disableOptimization super.mime-string; + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c0e9b7aab5ae3..6b56d9eb73543 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -150,4 +154,7 @@ self: super: { mysql-simple = addBuildDepends [ self.blaze-textual ] super.mysql-simple; + + # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) + inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index f36c77d636a7b..855afa28101d5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -118,4 +122,10 @@ self: super: { multistate = doJailbreak super.multistate; # https://github.com/lspitzner/butcher/issues/7 butcher = doJailbreak super.butcher; + + # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127 + # which means that the upstream cabal file isn't allowed to add the flag. + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index eb1245191cb82..b55429da65b52 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -2,6 +2,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -236,4 +240,9 @@ self: super: { hls-retrie-plugin = null; hls-splice-plugin = null; })); + + # https://github.com/fpco/inline-c/pull/131 + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index e1e3f2c99884e..9c7895d4fe6d2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -9,6 +9,10 @@ with haskellLib; +let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in + self: super: { llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -74,4 +78,9 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; + # https://github.com/fpco/inline-c/pull/131 + # and/or https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7739 + inline-c-cpp = + (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) + super.inline-c-cpp; } From 35f137ea98ea0276926c1b0ddb002a832a2f9c01 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 1 Apr 2022 16:55:06 +0200 Subject: [PATCH 08/15] haskellPackages.inline-c{,-cpp}: Add myself as maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3f2b936f21c6a..a379b13786704 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -326,6 +326,8 @@ package-maintainers: - hercules-ci-cli - hercules-ci-cnix-expr - hercules-ci-cnix-store + - inline-c + - inline-c-cpp rvl: - taffybar - arbtt From f513fcc9a9989c9d3f1e081015bb96b8efd5ea7b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 3 Apr 2022 14:16:15 +0200 Subject: [PATCH 09/15] all-cabal-hashes: 2022-03-30T19:23:57Z -> 2022-04-03T10:13:27Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d6138cf231767..e729226b71cf5 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a02557e981025a281de13f66204c2cd2e788732f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a02557e981025a281de13f66204c2cd2e788732f.tar.gz", - "sha256": "0c6jg9s4p65ynkkk0z6p9q4whz5hs1vmbq8zsn7pavxkzwa8ych1", - "msg": "Update from Hackage at 2022-03-30T19:23:57Z" + "commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz", + "sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl", + "msg": "Update from Hackage at 2022-04-03T10:13:27Z" } From ae349e390c747b09d12723e1e1d14b5ac03da0d3 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 3 Apr 2022 14:17:40 +0200 Subject: [PATCH 10/15] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 805 ++++++++++++++---- 1 file changed, 620 insertions(+), 185 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index abfa19d7ced66..39035381aa71a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -840,6 +840,42 @@ self: { maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; + "Agda_2_6_2_2" = callPackage + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, case-insensitive + , containers, data-hash, deepseq, directory, edit-distance, emacs + , equivalence, exceptions, filepath, ghc-compact, gitrev, happy + , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash + , parallel, pretty, process, regex-tdfa, split, stm, strict + , template-haskell, text, time, transformers, unordered-containers + , uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.6.2.2"; + sha256 = "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson array async base binary blaze-html boxes bytestring + case-insensitive containers data-hash deepseq directory + edit-distance equivalence exceptions filepath ghc-compact gitrev + hashable hashtables haskeline monad-control mtl murmur-hash + parallel pretty process regex-tdfa split stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ abbradar turion ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -40127,8 +40163,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.5"; - sha256 = "1drfv04v5137c726c9bpz8lh1c0blb4mfnca4dgzai91pjk026sd"; + version = "0.2.0.6"; + sha256 = "0k226jmpv6fnifbmbgdfvbj375an5g7bzzlcvfa1n5x65512ibp2"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -40147,8 +40183,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.4"; - sha256 = "08kx00dxmwj0vxazcd2s88q069swnzjfnj61kla5pczaz0aqh11w"; + version = "0.1.0.5"; + sha256 = "1h5pqcb1snmbbvcfpjcqrfbk9l8wry6i0mlz6vm347arhfwc62cd"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -47076,6 +47112,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_68_1" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.68.1"; + sha256 = "17pzp9p4rmd82smxwz2kh1jjd5ssy5b86jnv7a4ac1g1zgnnki0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -47977,8 +48040,8 @@ self: { }: mkDerivation { pname = "bugsnag"; - version = "1.0.0.0"; - sha256 = "0s0ppjhn1qylbcia2rpccq7xma26ch1qk9lq578df4i1djpl07zl"; + version = "1.0.0.1"; + sha256 = "1sbm85r2ia5k4rdbz8yqgd5x01b2l5kw0p4knj8mr8cr37fqzp8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47986,7 +48049,7 @@ self: { http-client-tls parsec template-haskell text th-lift-instances ua-parser unordered-containers ]; - testHaskellDepends = [ base hspec text unliftio ]; + testHaskellDepends = [ base hspec unliftio ]; description = "Bugsnag error reporter for Haskell"; license = lib.licenses.mit; }) {}; @@ -48040,8 +48103,8 @@ self: { }: mkDerivation { pname = "bugsnag-wai"; - version = "1.0.0.0"; - sha256 = "0qarc8w1vprklccrr4i8z5x6m4qry2f09fi43ac7jnh1axywv93a"; + version = "1.0.0.1"; + sha256 = "0f3x4m9nl277rhg2pwrja9xh6fffrwl2dm1cf3jiyngkrbrfck0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48059,8 +48122,8 @@ self: { }: mkDerivation { pname = "bugsnag-yesod"; - version = "1.0.0.0"; - sha256 = "181qdsq7dnzsna05g78r613mgfl3shxx6n0zllnzf4m3c05vq5j6"; + version = "1.0.0.1"; + sha256 = "06w2ndxk8czwdfwyy3ylkhzagbaxx6gkix8lwybks0vsxwjr6w83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54620,19 +54683,19 @@ self: { "cfn-flip" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, doctest - , filepath, Glob, hspec, libyaml, resourcet, text, unliftio - , unliftio-core, yaml + , filepath, Glob, hspec, libyaml, text, unliftio, unliftio-core + , yaml }: mkDerivation { pname = "cfn-flip"; - version = "0.1.0.1"; - sha256 = "0vykc7lwjarbf0zqkjfms5sv82vsd64q102qrmvl3qs8mil0vkv2"; + version = "0.1.0.2"; + sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds"; libraryHaskellDepends = [ - aeson base bytestring conduit libyaml resourcet text unliftio - unliftio-core yaml + aeson base bytestring conduit libyaml text unliftio unliftio-core + yaml ]; testHaskellDepends = [ - aeson base conduit doctest filepath Glob hspec libyaml yaml + aeson base doctest filepath Glob hspec libyaml yaml ]; description = "Haskell implementation of aws/cfn-flip"; license = lib.licenses.mit; @@ -54990,6 +55053,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "chapelure" = callPackage + ({ mkDerivation, ansi-terminal, base, colour, containers + , hsluv-haskell, hspec, nonempty-vector, optics-core, prettyprinter + , string-qq, text, text-display, vector + }: + mkDerivation { + pname = "chapelure"; + version = "0.0.1.0"; + sha256 = "0avlif17mx59vmla2gj649f73hglf38yhcwpblzly8yif2nnwj07"; + libraryHaskellDepends = [ + ansi-terminal base colour containers hsluv-haskell nonempty-vector + optics-core prettyprinter text text-display vector + ]; + testHaskellDepends = [ + base hspec nonempty-vector prettyprinter string-qq text vector + ]; + description = "A diagnostics library for Haskell"; + license = lib.licenses.mit; + }) {}; + "char-decode" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -56805,6 +56888,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "citeproc_0_7" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific + , text, timeit, transformers, unicode-collation, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.7"; + sha256 = "1xsfsz6hdp0ickps1qafkfn7pwjxc22a5ib3bl99jdjbx7fql6h9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types safe scientific text + transformers unicode-collation uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -58619,6 +58729,26 @@ self: { license = lib.licenses.mit; }) {}; + "closed_0_2_0_2" = callPackage + ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec + , markdown-unlit, persistent, QuickCheck, text, vector + }: + mkDerivation { + pname = "closed"; + version = "0.2.0.2"; + sha256 = "0dh73bayq78a0idbh2lprmb8hazj03g4ma5gcmad06bq01nl9yxh"; + libraryHaskellDepends = [ + aeson base cassava deepseq hashable persistent QuickCheck text + ]; + testHaskellDepends = [ + aeson base cassava hspec markdown-unlit persistent text vector + ]; + testToolDepends = [ markdown-unlit ]; + description = "Integers bounded by a closed interval"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "closed-classes" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -61242,6 +61372,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-data, unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2.2"; + sha256 = "0kmjc9xgzy33kxz842mw5rdywip3lmk7v3ambrs87nakawgl42xp"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers unicode-data + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-cli" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark , commonmark-extensions, commonmark-pandoc, containers, mtl @@ -61283,6 +61436,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_3_1" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3.1"; + sha256 = "1hnhaxw7mpsbcgqz1vlxy0xnnkgh590hi6gv1wk5fw1j12viqdzi"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -69819,13 +69994,13 @@ self: { }) {inherit (pkgs) curl;}; "curl-aeson" = callPackage - ({ mkDerivation, aeson, base, curl, text, utf8-string }: + ({ mkDerivation, aeson, base, bytestring, curl, text }: mkDerivation { pname = "curl-aeson"; - version = "0.0.4"; - sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx"; - libraryHaskellDepends = [ aeson base curl text utf8-string ]; - description = "Communicate with HTTP service using JSON"; + version = "0.1.0.1"; + sha256 = "1hiz2rwbycl2nx5k1157nnl661rk1gkj7m4vc4qac1saqvf9jxdz"; + libraryHaskellDepends = [ aeson base bytestring curl text ]; + description = "Communicate with web services using JSON"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -74710,18 +74885,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "deepseq_1_4_6_1" = callPackage - ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework - , test-framework-hunit - }: + "deepseq_1_4_7_0" = callPackage + ({ mkDerivation, array, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.4.6.1"; - sha256 = "178k97l6yh8bklnkzqsla4l2vms16ys126abs7d5i0fcnyj472fm"; - libraryHaskellDepends = [ array base ]; - testHaskellDepends = [ - array base ghc-prim HUnit test-framework test-framework-hunit - ]; + version = "1.4.7.0"; + sha256 = "0sm00rsw714y73qr5zihz5fhxw0hahs6ksmf8wa60m1qwb9jcy9v"; + libraryHaskellDepends = [ array base ghc-prim ]; + testHaskellDepends = [ array base ghc-prim ]; description = "Deep evaluation of data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -75927,8 +76098,8 @@ self: { }: mkDerivation { pname = "deriving-trans"; - version = "0.3.1.0"; - sha256 = "0x7kk9b08f9fplkycw2202qil3rh5l2x7l7whjlv30b0v5k885xz"; + version = "0.3.2.0"; + sha256 = "0w13274j1qn6qdx9kmd01qbcwhnpvqn4rvrnpv60gwqfi4hwgcqs"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -76566,6 +76737,8 @@ self: { pname = "dhall"; version = "1.41.1"; sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv"; + revision = "1"; + editedCabalFile = "19lgfkyg1p9crrf3gi508zya477vma2ks7ib7hw0r84sl4jjiaji"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -81276,6 +81449,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl + , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.4"; + sha256 = "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq emojis mtl text + ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -88652,64 +88847,63 @@ self: { }) {}; "espial" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring - , case-insensitive, classy-prelude, classy-prelude-conduit - , classy-prelude-yesod, conduit, containers, data-default - , directory, ekg, ekg-core, entropy, esqueleto, fast-logger - , file-embed, foreign-store, hjsmin, hscolour, hspec, http-api-data - , http-client, http-client-tls, http-conduit, http-types - , iso8601-time, microlens, monad-logger, monad-metrics, mtl - , optparse-generic, parser-combinators, persistent + ({ mkDerivation, aeson, attoparsec, base, bcrypt, blaze-html + , bytestring, case-insensitive, classy-prelude + , classy-prelude-conduit, classy-prelude-yesod, conduit, connection + , containers, data-default, directory, entropy, esqueleto + , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec + , html-entities, http-api-data, http-client, http-client-tls + , http-conduit, http-types, iso8601-time, microlens, monad-logger + , mtl, optparse-generic, parser-combinators, persistent , persistent-sqlite, persistent-template, pretty-show, safe , shakespeare, template-haskell, text, time, transformers - , unordered-containers, vector, wai, wai-extra, wai-logger - , wai-middleware-metrics, warp, yaml, yesod, yesod-auth, yesod-core - , yesod-form, yesod-static, yesod-test + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed + , yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.7"; - sha256 = "06nlmz8j6f64dgbd9y9b7i9fd1bv32yxijx764zlvy75i6vbips5"; + version = "0.0.9"; + sha256 = "128vwdmilvvxwaylslway3d6mx4ad9pcx5y2x74x38hi9mpmrylc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto - fast-logger file-embed foreign-store hjsmin hscolour http-api-data - http-client http-client-tls http-conduit http-types iso8601-time - microlens monad-logger monad-metrics mtl parser-combinators + connection containers data-default directory entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour html-entities + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers - unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static + unordered-containers vector wai wai-extra wai-logger warp yaml + yesod yesod-auth yesod-core yesod-form yesod-newsfeed yesod-static ]; executableHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto - fast-logger file-embed foreign-store hjsmin hscolour http-api-data - http-client http-client-tls http-conduit http-types iso8601-time - microlens monad-logger monad-metrics mtl optparse-generic + connection containers data-default directory entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour html-entities + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger mtl optparse-generic parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static + warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed + yesod-static ]; testHaskellDepends = [ - aeson attoparsec base bcrypt bytestring case-insensitive + aeson attoparsec base bcrypt blaze-html bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit - containers data-default directory ekg ekg-core entropy esqueleto + connection containers data-default directory entropy esqueleto fast-logger file-embed foreign-store hjsmin hscolour hspec - http-api-data http-client http-client-tls http-conduit http-types - iso8601-time microlens monad-logger monad-metrics mtl + html-entities http-api-data http-client http-client-tls + http-conduit http-types iso8601-time microlens monad-logger mtl parser-combinators persistent persistent-sqlite persistent-template pretty-show safe shakespeare template-haskell text time transformers unordered-containers vector wai wai-extra wai-logger - wai-middleware-metrics warp yaml yesod yesod-auth yesod-core - yesod-form yesod-static yesod-test + warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed + yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; @@ -88746,7 +88940,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_3_2" = callPackage + "esqueleto_3_5_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -88756,8 +88950,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.3.2"; - sha256 = "0sdp8zxa8jqql1dmhm0wf20hj5yd3853ha7f8wg24dvbjff8z1yj"; + version = "3.5.4.0"; + sha256 = "1c38kx04nkk68bj76mkbjbmw9fhb3ljn3j8mwsls6q7m4z49m6yy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -92239,6 +92433,34 @@ self: { broken = true; }) {}; + "faktory_1_1_2_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base + , bytestring, connection, cryptonite, errors, hspec, markdown-unlit + , megaparsec, memory, mtl, network, random, safe-exceptions + , scanner, semigroups, text, time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.1.2.2"; + sha256 = "0vkjd20wpzb170lisk1sb4508h56mgjbk4f5qbi6k8vvbdipiaqy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson aeson-qq async base hspec markdown-unlit mtl time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -93640,6 +93862,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "feedback" = callPackage + ({ mkDerivation, autodocodec, autodocodec-yaml, base, conduit + , containers, envparse, fsnotify, optparse-applicative, path + , path-io, pretty-show, safe-coloured-text + , safe-coloured-text-layout, safe-coloured-text-terminfo, text + , time, typed-process, unliftio, yaml + }: + mkDerivation { + pname = "feedback"; + version = "0.0.0.0"; + sha256 = "1y4p38cd0cqg4r43y2p0n2i99q83vnhm7gswx0j34p58isrbad4x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + autodocodec autodocodec-yaml base conduit containers envparse + fsnotify optparse-applicative path path-io pretty-show + safe-coloured-text safe-coloured-text-layout + safe-coloured-text-terminfo text time typed-process unliftio yaml + ]; + executableHaskellDepends = [ base ]; + description = "Declarative feedback loop manager"; + license = lib.licenses.gpl3Only; + }) {}; + "fei-base" = callPackage ({ mkDerivation, attoparsec, base, c2hs, constraints, deepseq , haskell-src-exts, hslogger, lens, mxnet, optparse-applicative @@ -98833,13 +99079,13 @@ self: { , persistent-postgresql, postgresql-simple, primitive, process , resource-pool, retry, rio, safe, semigroupoids, template-haskell , temporary, text, time, transformers, transformers-base, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod, yesod-core + , unordered-containers, vector, wai, wai-extra, yaml, yesod + , yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.9"; - sha256 = "000frzvydpmyn547za0zlf7w38avcgspvjpcakalsdv5vzj83kk5"; + version = "1.0.2.10"; + sha256 = "05y2b4lfc0wxygjrvjlw3nfl9s1x9km095k2vzj57mb58zkr3kyv"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit containers data-default datadog doctest ekg-core errors exceptions @@ -98850,8 +99096,7 @@ self: { network-uri persistent persistent-postgresql postgresql-simple primitive process resource-pool retry rio safe semigroupoids template-haskell text time transformers transformers-base unliftio - unliftio-core unordered-containers vector wai wai-extra yaml yesod - yesod-core + unordered-containers vector wai wai-extra yaml yesod yesod-core ]; testHaskellDepends = [ aeson base bytestring directory hspec http-types lens lens-aeson @@ -106535,12 +106780,12 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_2_0_3" = callPackage + "ghcjs-base_0_2_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.3"; - sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg"; + version = "0.2.1.0"; + sha256 = "05dw3kvrwgipxjg1i3gfirqz260azcmgj1rwp7m37a94q4550bcq"; description = "base library for GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -115214,6 +115459,31 @@ self: { license = lib.licenses.mit; }) {}; + "graphula_2_0_1_1" = callPackage + ({ mkDerivation, base, containers, directory, generic-arbitrary + , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl + , persistent, persistent-sqlite, QuickCheck, random, resourcet + , semigroups, temporary, text, transformers, unliftio + , unliftio-core + }: + mkDerivation { + pname = "graphula"; + version = "2.0.1.1"; + sha256 = "0gn33jz9nb2pf1mkjzwnf04l0shnvj520qb0jmz6d87w79jiqdlj"; + libraryHaskellDepends = [ + base containers directory generics-eot HUnit mtl persistent + QuickCheck random semigroups temporary text unliftio unliftio-core + ]; + testHaskellDepends = [ + base generic-arbitrary hspec markdown-unlit monad-logger persistent + persistent-sqlite QuickCheck resourcet transformers unliftio-core + ]; + testToolDepends = [ markdown-unlit ]; + description = "A simple interface for generating persistent data and linking its dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "graphula-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit @@ -115332,6 +115602,23 @@ self: { license = lib.licenses.mit; }) {}; + "gravatar_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, data-default, doctest, Glob + , hspec, HTTP, pureMD5, text + }: + mkDerivation { + pname = "gravatar"; + version = "0.8.1"; + sha256 = "0ijcv15kihy6125fm2kyxi997fxii3hvr62lx25nri5aa0qy6vkw"; + libraryHaskellDepends = [ + base bytestring data-default HTTP pureMD5 text + ]; + testHaskellDepends = [ base doctest Glob hspec ]; + description = "Generate Gravatar image URLs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "gray-code" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -118872,8 +119159,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.9.3"; - sha256 = "0kiy570s08qf9gqphbbv5kzhfkbc3m1jpzpszpb52rbmflmgwi7m"; + version = "2.10.0"; + sha256 = "19szxwz633n8zk0zm9hzw029npy9my84kdygxv9jbmy69ndyw9d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138819,8 +139106,8 @@ self: { pname = "hpc-lcov"; version = "1.0.1"; sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; - revision = "2"; - editedCabalFile = "1sbd4wk977hh7jvy2ingmavkqx7fzicfa70figipa7lzdq3lg0ls"; + revision = "3"; + editedCabalFile = "1nq636asnibbx6mrx18kr02pcg3jr2m28z40vk9iydmz6lr5msni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -139370,8 +139657,8 @@ self: { }: mkDerivation { pname = "hquantlib"; - version = "0.0.5.0"; - sha256 = "1zi31y89kdbid3xjvpsd2iqwvn8a7d2i5518maigkmhp5v1lg0w6"; + version = "0.0.5.1"; + sha256 = "0fbmji48ry3adq9lfpxwfx2q064cbrav8wq2ykaqsszgq9yiysc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139395,8 +139682,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "hquantlib-time"; - version = "0.0.4.1"; - sha256 = "0g2j7m14ic40lhcnbvfjya3qh7ngx658qlmrr0dzr5r1ywcyv75c"; + version = "0.0.5.1"; + sha256 = "1jvcpcnss3hgnjp6isbpbmjml068gasrlj376sbv7diynh8a4rlf"; libraryHaskellDepends = [ base time ]; description = "HQuantLib Time is a business calendar functions extracted from HQuantLib"; license = "LGPL"; @@ -143449,14 +143736,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_9_4" = callPackage + "hspec_2_9_5" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.9.4"; - sha256 = "1s009dn0hkqfn5c0y0xfja18wps430f2dkga9mfrrndhvlvx8fm3"; + version = "2.9.5"; + sha256 = "170fsms5gmp3yxcw3if35mpv6sq9mi6k259szspbh3qdp3d1z6mc"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -143548,7 +143835,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_9_4" = callPackage + "hspec-core_2_9_5" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -143557,8 +143844,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.9.4"; - sha256 = "0bkr2hywmlawyyrp27xgfd4a080bk1i5kj81hcxbg2w8y0i7r0w4"; + version = "2.9.5"; + sha256 = "0xyn90l7rar1av65bld7fs499mn1vpyga4vpz2ygi7lvc59lm0ay"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck @@ -143616,14 +143903,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_9_4" = callPackage + "hspec-discover_2_9_5" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.9.4"; - sha256 = "16y3z6f32bbnkxw142y90hs0512rh2mp9904ffahmag9m95qfbnv"; + version = "2.9.5"; + sha256 = "0sd2bkwdgnzkb4gjaqk9q21s0qnp0q3n19yf4phb4qvl878rvnpk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -143666,6 +143953,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-json_1_0_0_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec + , HUnit, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "hspec-expectations-json"; + version = "1.0.0.6"; + sha256 = "1gb4i4vc6f59vp120asl6fr20n6d9xnibvnfxjd94knflidhq80n"; + libraryHaskellDepends = [ + aeson aeson-pretty base Diff HUnit scientific text + unordered-containers vector + ]; + testHaskellDepends = [ aeson-qq base hspec ]; + description = "Hspec expectations for JSON Values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -143866,22 +144171,22 @@ self: { broken = true; }) {}; - "hspec-junit-formatter_1_1_0_1" = callPackage + "hspec-junit-formatter_1_1_0_2" = callPackage ({ mkDerivation, base, conduit, containers, directory, exceptions , filepath, hspec, hspec-core, iso8601-time, markdown-unlit , temporary, text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.1"; - sha256 = "194r8bxfn525mn8vq4dcfkbsn668s11yz4mdqbfr5qy29i1bzm5p"; + version = "1.1.0.2"; + sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g"; libraryHaskellDepends = [ base conduit containers directory exceptions filepath hspec-core iso8601-time text time xml-conduit xml-types ]; testHaskellDepends = [ - base containers filepath hspec hspec-core markdown-unlit temporary - text xml-conduit + base containers filepath hspec markdown-unlit temporary text + xml-conduit ]; testToolDepends = [ markdown-unlit ]; description = "A JUnit XML runner/formatter for hspec"; @@ -148055,14 +148360,17 @@ self: { }) {}; "hw-aeson" = callPackage - ({ mkDerivation, aeson, base, doctest, doctest-discover, hedgehog - , hspec, hspec-discover, text + ({ mkDerivation, aeson, base, containers, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, text, text-short + , unordered-containers }: mkDerivation { pname = "hw-aeson"; - version = "0.1.2.0"; - sha256 = "0a4x97laraxyyrpkklj4qxwgh7lmxxnzdg7y0ki9041ck8ymsmdr"; - libraryHaskellDepends = [ aeson base text ]; + version = "0.1.5.0"; + sha256 = "0dzwn1k467dij8ihqzxq6vhm5faqqjndvyw0ikwjhwh0lf1h38cz"; + libraryHaskellDepends = [ + aeson base containers text text-short unordered-containers + ]; testHaskellDepends = [ aeson base doctest doctest-discover hedgehog hspec ]; @@ -157370,13 +157678,13 @@ self: { ({ mkDerivation, alex, array, base, bytestring, containers , criterion, deepseq, directory, filepath, happy, microlens , microlens-mtl, mtl, optparse-applicative, prettyprinter - , recursion, regex-rure, split, tasty, tasty-hunit, text + , recursion, regex-rure, silently, split, tasty, tasty-hunit, text , transformers, vector }: mkDerivation { pname = "jacinda"; - version = "0.3.1.0"; - sha256 = "1nn3c91fhq46ng2yh9425cpxlk5mksalx5wrv1d7z0xn5m1v1387"; + version = "1.0.0.0"; + sha256 = "1yskpr3mvfhzxcjf0f9sf3mhsg892vqkx5kd4vz4w6wk3vv1iz3i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -157390,7 +157698,9 @@ self: { base bytestring optparse-applicative ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq silently + ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -158642,8 +158952,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.8.1"; - sha256 = "19jszi6b2fhgz8cb0a4p6ixjg78c28cr78abwjcffbx173jp981h"; + version = "0.9.8.2"; + sha256 = "17xffxyl4h8fbb608gzhflli89qxhrzf38bp9l8n2w2bwix7w01i"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -158660,8 +158970,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.8.0"; - sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq"; + version = "0.9.8.2"; + sha256 = "0nbsjmn52dr0rfslz6c7f16z7brc76ljq78bkkbq3aj8ljadh0p6"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -158716,8 +159026,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.8.0"; - sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np"; + version = "0.9.8.2"; + sha256 = "12914i4l7hkwvwvzf25vr7zywc6xp9cq0mfzr57kzw6ga1y3gvxb"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -158743,8 +159053,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.8.1"; - sha256 = "1q4hyjlvw3m2139s1rp658hkqhnayk00nijdymjr8606d7cfyp7p"; + version = "0.9.8.2"; + sha256 = "0cqn013dzn5wwap74i5j9kd6maxsqxb84zys6p80kjl5vnk5pvxh"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -158780,8 +159090,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.8.0"; - sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw"; + version = "0.9.8.2"; + sha256 = "07qba7bnygnsy3yg4mk8bn8wfzca43cd7mzzjp5b4yracchvljqj"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -184127,15 +184437,15 @@ self: { }) {}; "monad-control-identity" = callPackage - ({ mkDerivation, base, monad-control, transformers + ({ mkDerivation, base, monad-control, stm, transformers , transformers-base }: mkDerivation { pname = "monad-control-identity"; - version = "0.1.0.3"; - sha256 = "0nxsyhyvp04xr7js2z8mvmh2w2b2fwv5zzkbgjagm6l51pqpam6q"; + version = "0.2.0.0"; + sha256 = "1b636vakpqprwfb0cb7fpcsff8adq4frj4g98vv1yaxzi56rjbb1"; libraryHaskellDepends = [ - base monad-control transformers transformers-base + base monad-control stm transformers transformers-base ]; description = "Stronger classes than monad-control"; license = lib.licenses.bsd3; @@ -186489,8 +186799,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.19.0"; - sha256 = "0yfqbpis3385hqm3xlyx0ks2jnrwvkx898g2m2rb3qskaqblfcj9"; + version = "0.19.3"; + sha256 = "0vg48x6sb5rg7mzx905qjv026yq4b76kxfyfpakiw3xybqpcdw0w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -186518,8 +186828,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.19.0"; - sha256 = "0k7bl9gs8sdmfi5wdka5rjlp5vjn7py8n8a09rwws7kgqa3lvd0n"; + version = "0.19.3"; + sha256 = "0v00xp6hhaxbjp6kl124cj22p57hnqdkg8kksms9cp2h7f88vm3g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -186566,8 +186876,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.19.0"; - sha256 = "00hgxi8c7alfpvhxwcb7gcxki14vaasmg1qycfnyj7s2715w6i4c"; + version = "0.19.3"; + sha256 = "1vfk1rlm2lkra5xfp9zh3f4q70xhb42v4zyfy1xk6x9k2k919pmg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-code-gen @@ -186591,8 +186901,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.19.0"; - sha256 = "0avy4imllxlfyfw3fvwb0nzwd03pwdr0s67k3a2gymhqqz3zf37i"; + version = "0.19.3"; + sha256 = "0l9g0pnp3vvlpc5kdhgnvwqgid4d25wgr1mnlqc44s350si623qa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186617,8 +186927,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.19.0"; - sha256 = "03sr4yy0n5wr53xk1x623d1zj03v6zpsv7csafp5m40kijx0bl2q"; + version = "0.19.3"; + sha256 = "0frd7hvy94q4iknih4ph11kgklk5a70yryhmbfhjipv5141ysrns"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -186645,8 +186955,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.19.0"; - sha256 = "179cwrmyj42hzd70qymrg7y5ll6ld5miadhlr0w0mqbfqnbj0lbv"; + version = "0.19.3"; + sha256 = "16flpss0b3qvdcwazsfisw8f0dw5z5p4rrxm7bpr2j54dlz98c7n"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -186678,14 +186988,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_19_0" = callPackage + "morpheus-graphql-tests_0_19_3" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.19.0"; - sha256 = "1ymwgsdj4gl88rarqjgb0bx05gdanqxwghz8ws2hh5cvn9m9g4sb"; + version = "0.19.3"; + sha256 = "1w10l9l0774hjhq8h0bxlqmksd8g350ccdv5ja86j89lb4glnxla"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -190750,8 +191060,8 @@ self: { pname = "named"; version = "0.3.0.1"; sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij"; - revision = "2"; - editedCabalFile = "03g6y6viakybmxpv9jnlbhq5yvchwdp2f1cvcdvlm10c5wkl71a1"; + revision = "3"; + editedCabalFile = "1rfli2b4asgasvgp7zjvydhxbyd0vx44vr7yck2760wz1crkzhhn"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; @@ -192045,8 +192355,8 @@ self: { }: mkDerivation { pname = "net-mqtt-rpc"; - version = "0.2.0.0"; - sha256 = "1ql1hjvx41gspjbpr4rldrcn0xj483g2cphvxbb51m4x6n690lkn"; + version = "0.2.0.1"; + sha256 = "079029bfzp9srgxz8655kkiwvccc0164hg4dpmg7f22qis0dd8vp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195660,6 +195970,19 @@ self: { license = lib.licenses.mit; }) {}; + "nonempty-zipper_1_0_0_4" = callPackage + ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: + mkDerivation { + pname = "nonempty-zipper"; + version = "1.0.0.4"; + sha256 = "19r7lxjwiscg5ml7l2bx6sizb2rlbxmv81shqwnf8yjbnmpibmkp"; + libraryHaskellDepends = [ base comonad deepseq safe ]; + testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; + description = "A non-empty comonadic list zipper"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -202971,7 +203294,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-plot_1_5_0" = callPackage + "pandoc-plot_1_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl @@ -202981,8 +203304,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.0"; - sha256 = "1naq6kfzxghxn6gzkp0697sdmfjdr2hk790d2rrwx72zv66g35vy"; + version = "1.5.1"; + sha256 = "0n0kazc43j4q39r9fp3400clbnpm0nsghv07pv16lwdjbl67sv91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203103,6 +203426,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-types_1_22_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.22.2"; + sha256 = "1m5lln26ixzswx6pb1n7iv99w8i9gii6lhg07whg56jl2gvfghk0"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -220070,20 +220417,18 @@ self: { ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, bytestring, cereal, containers , contravariant, deepseq, doctest, filepath, foldl - , generic-arbitrary, hashable, haskell-src + , generic-arbitrary, hashable, haskell-src, hedgehog , insert-ordered-containers, lens, mtl, neat-interpolation , optparse-applicative, optparse-generic, parsec, parsers, pretty , pretty-show, proto3-wire, QuickCheck, quickcheck-instances , range-set-list, safe, swagger2, system-filepath, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers, turtle - , vector + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, text, time + , transformers, turtle, vector }: mkDerivation { pname = "proto3-suite"; - version = "0.4.2"; - sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz"; - revision = "1"; - editedCabalFile = "1s9mr6y31kbm0f316i7q0w4qgmi0mas23dhbam6i9pshfa0bav0x"; + version = "0.5.0"; + sha256 = "09y09y321jflxlrx13b9fm4v3f3k4j475wpp0bilmc4ygq9bxjcm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -220101,11 +220446,11 @@ self: { ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring cereal - containers deepseq doctest generic-arbitrary mtl pretty-show - proto3-wire QuickCheck swagger2 tasty tasty-hunit tasty-quickcheck - text transformers turtle vector + containers deepseq doctest generic-arbitrary hedgehog mtl + pretty-show proto3-wire QuickCheck swagger2 tasty tasty-hedgehog + tasty-hunit tasty-quickcheck text transformers turtle vector ]; - description = "A low level library for writing out data in the Protocol Buffers wire format"; + description = "A higher-level API to the proto3-wire library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -220432,8 +220777,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.2.2"; - sha256 = "1glilqib6bs1kbb0yyrzqxbsijrcrdm9q3cgmymgacc7kllc616n"; + version = "0.1.2.3"; + sha256 = "1pv1xdzxsdgahv1i7nxdm0di7hs36zr57rpkny666myracdh1wvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221443,8 +221788,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.7"; - sha256 = "0a8ia3qk6x6c42kkp00bdsnrpsrypy6i0bpavm844b0ny8dalqlr"; + version = "0.14.9"; + sha256 = "13canh915v668ii58y880b6zgzga3qmxxiblljs9qsdpwx1q7yzd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260426,8 +260771,8 @@ self: { pname = "string-interpolate"; version = "0.3.1.1"; sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; - revision = "2"; - editedCabalFile = "1blxy1ld69i8bg2340j0dcrcbdrqqnx5q8v47jda6183jfzwrxr6"; + revision = "3"; + editedCabalFile = "0kpk5mwmi7qzvx0hkiq6pwfyid99ic95zmxc36xxfpw4qxfc7024"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -261325,8 +261670,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.14.0.1"; - sha256 = "109d7xf0k86c6hgdc0lgn9fvlqg4gag9nrj52z9ajw7s4qi3y3f1"; + version = "0.14.1.0"; + sha256 = "1chgkxqbnrgq7w9zzx118igp08h9vfgp150akazmgimy378cadlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263329,14 +263674,14 @@ self: { }: mkDerivation { pname = "sydtest-servant"; - version = "0.2.0.0"; - sha256 = "063bjik3yx7wbawdw1x4yw8ba8k83bq2xysczkl3mxqhj4c0ngx9"; + version = "0.2.0.1"; + sha256 = "1yclwmcqp6wkcd980ha7a93dz99zc55mcw2z5fwhk3gfwdpdfyfj"; libraryHaskellDepends = [ base http-client servant servant-client servant-server sydtest sydtest-wai ]; testHaskellDepends = [ - base servant servant-client servant-server stm sydtest + base servant servant-client servant-server stm sydtest sydtest-wai ]; testToolDepends = [ sydtest-discover ]; description = "A servant companion library for sydtest"; @@ -267811,6 +268156,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "telegram-bot-simple_0_4_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron + , filepath, hashable, http-api-data, http-client, http-client-tls + , monad-control, mtl, pretty-show, profunctors, servant + , servant-client, servant-multipart-api, servant-multipart-client + , split, stm, template-haskell, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "telegram-bot-simple"; + version = "0.4.5"; + sha256 = "0c2j0dmx6j15c8csmv64zc3m7qnbvnf5aqan7qjc8d5yfzbxr4nr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cron filepath hashable + http-api-data http-client http-client-tls monad-control mtl + pretty-show profunctors servant servant-client + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers + ]; + description = "Easy to use library for building Telegram bots"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "telegram-raw-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deriving-aeson , generic-lens, hashable, http-client, http-client-tls, http-media @@ -268751,12 +269122,8 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.3.0"; - sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s"; - revision = "1"; - editedCabalFile = "0k62lbwigk97shxlx5c34d2k81ndims9nc36rlcv34s0iig0lh7d"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "0vni6wpdmqmbm7ypckr17qbjwilwilj3bibbmn6lv096n1wn751h"; libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = lib.licenses.bsd3; @@ -269834,6 +270201,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_5" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.5"; + sha256 = "16i40va03v04222wn92fz62jri3094mfim6kdqk29335gamn0yk9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -271753,15 +272143,13 @@ self: { }) {}; "theatre" = callPackage - ({ mkDerivation, base, contravariant, semigroups, slave-thread - , unagi-chan - }: + ({ mkDerivation, base, contravariant, slave-thread, unagi-chan }: mkDerivation { pname = "theatre"; - version = "1.0.0.1"; - sha256 = "0vcli8i0vrxv8fzjdyp684fvp7640xmwc3yawz12mfvxcpgrs2xq"; + version = "1.0.0.2"; + sha256 = "1iwl4wswhav9d5vnfgwx9w9sms785jwxxc0vx7p5x2kb9hf3d8ac"; libraryHaskellDepends = [ - base contravariant semigroups slave-thread unagi-chan + base contravariant slave-thread unagi-chan ]; description = "Minimalistic actor library"; license = lib.licenses.mit; @@ -300938,6 +301326,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "yesod-paginator_1_1_2_1" = callPackage + ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces + , persistent, QuickCheck, quickcheck-classes, safe, text + , transformers, uri-encode, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-paginator"; + version = "1.1.2.1"; + sha256 = "0d27jh5qizi9ppf7lvvpmmlih80hhgl5znjbknl12r95pkcjjy2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup path-pieces persistent safe text transformers + uri-encode yesod-core + ]; + testHaskellDepends = [ + base doctest hspec QuickCheck quickcheck-classes yesod-core + yesod-test + ]; + description = "A pagination approach for yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-paypal-rest" = callPackage ({ mkDerivation, base, paypal-rest-client, time, yesod-core }: mkDerivation { @@ -301267,6 +301679,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-routes-flow_3_0_0_2" = callPackage + ({ mkDerivation, attoparsec, base, classy-prelude, containers + , hspec, hspec-expectations, semigroups, shakespeare, system-fileio + , system-filepath, text, yesod-core + }: + mkDerivation { + pname = "yesod-routes-flow"; + version = "3.0.0.2"; + sha256 = "1gw6a5089j0a1c0aivlznsqld1r8wc6babjcc7c7vzy7wpnc87c9"; + libraryHaskellDepends = [ + attoparsec base classy-prelude containers system-fileio + system-filepath text yesod-core + ]; + testHaskellDepends = [ + attoparsec base classy-prelude containers hspec hspec-expectations + semigroups shakespeare system-fileio system-filepath text + yesod-core + ]; + description = "Generate Flow routes for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-routes-typescript" = callPackage ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio , text, yesod-core, yesod-routes @@ -304166,12 +304601,12 @@ self: { }: mkDerivation { pname = "zuul"; - version = "0.1.0.0"; - sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v"; + version = "0.1.1.0"; + sha256 = "0pwiy690z32c9b5x2x1pmcczby7xwby6z8jsgl25zkrb07yagxz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-client http-client-tls text + aeson base containers http-client http-client-tls text ]; executableHaskellDepends = [ aeson aeson-pretty base containers directory filepath From f5536149557e611a8f8b6503bd51cb2e62306a2a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 15 Mar 2022 12:26:32 +0100 Subject: [PATCH 11/15] haskellPackages.graphql-engine: 2.0.10 -> 2.3.1 haskellPackages.kriti-lang: init at 0.3.1 Towards getting hasura-related packages to work with Stackage Nightly / GHC 9.0. --- .../haskell-modules/configuration-common.nix | 47 ++++--- .../haskell-modules/non-hackage-packages.nix | 1 + .../patches/graphql-engine-mapkeys.patch | 33 ----- .../misc/haskell/hasura/ekg-core.nix | 17 ++- .../misc/haskell/hasura/ekg-json.nix | 9 +- .../misc/haskell/hasura/graphql-engine.nix | 115 ++++++++++-------- .../misc/haskell/hasura/graphql-parser.nix | 23 ++-- .../misc/haskell/hasura/kriti-lang.nix | 41 +++++++ .../misc/haskell/hasura/pg-client.nix | 35 +++--- pkgs/development/misc/haskell/hasura/pool.nix | 2 +- .../development/misc/haskell/hasura/update.sh | 12 +- pkgs/servers/hasura/cli.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 13 files changed, 194 insertions(+), 145 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch create mode 100644 pkgs/development/misc/haskell/hasura/kriti-lang.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 54366201b1ddb..2b64c549f18b6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1484,35 +1484,48 @@ self: super: { # hasura packages need some extra care graphql-engine = overrideCabal (drv: { - patches = [ ./patches/graphql-engine-mapkeys.patch ]; + patches = [ + # Compat with unordered-containers >= 0.2.15.0 + (fetchpatch { + name = "hasura-graphql-engine-updated-deps.patch"; + url = "https://github.com/hasura/graphql-engine/commit/d50aae87a58794bc1fc66c7a60acb0c34b5e70c7.patch"; + stripLen = 1; + excludes = [ "cabal.project.freeze" ]; + sha256 = "0lb5l9vfynr85i9xs53w4mpgczp04ncxz7846n3y91ri34fa87v3"; + }) + # Compat with hashable >= 1.3.4.0 + (fetchpatch { + name = "hasura-graphql-engine-hashable-1.3.4.0.patch"; + url = "https://github.com/hasura/graphql-engine/commit/e48b2287315fb09005ffd52c0a686dc321171ae2.patch"; + sha256 = "1jppnanmsyl8npyf59s0d8bgjy7bq50vkh5zx4888jy6jqh27jb6"; + stripLen = 1; + }) + # Compat with unordered-containers >= 0.2.17.0 + (fetchpatch { + name = "hasura-graphql-engine-unordered-containers-0.2.17.0.patch"; + url = "https://github.com/hasura/graphql-engine/commit/3a1eb3128a2ded2da7c5fef089738890828cce03.patch"; + sha256 = "0vz7s8m8mjvv728vm4q0dvvrirvydaw7xks30b5ddj9f6a72a2f1"; + stripLen = 1; + }) + ]; doHaddock = false; - version = "2.0.10"; - }) (super.graphql-engine.overrideScope (self: super: { + version = "2.3.1"; + }) (super.graphql-engine.override { immortal = self.immortal_0_2_2_1; resource-pool = self.hasura-resource-pool; ekg-core = self.hasura-ekg-core; ekg-json = self.hasura-ekg-json; - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; - })); - hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: { - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; - })); - hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { - ekg-core = self.hasura-ekg-core; - hspec = dontCheck self.hspec_2_9_4; - hspec-core = dontCheck self.hspec-core_2_9_4; - hspec-discover = dontCheck super.hspec-discover_2_9_4; }); + hasura-ekg-json = super.hasura-ekg-json.override { + ekg-core = self.hasura-ekg-core; + }; pg-client = overrideCabal (drv: { librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; # wants a running DB to check against doCheck = false; }) (super.pg-client.override { resource-pool = self.hasura-resource-pool; + ekg-core = self.hasura-ekg-core; }); # https://github.com/bos/statistics/issues/170 diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index e06f9d30d2daa..beb81a58d8638 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -30,6 +30,7 @@ self: super: { pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {}; graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {}; graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {}; + kriti-lang = self.callPackage ../misc/haskell/hasura/kriti-lang.nix {}; hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {}; hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {}; hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {}; diff --git a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch deleted file mode 100644 index 9035185dc2d58..0000000000000 --- a/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs -index eaff0dfba..9902cadd0 100644 ---- a/src-lib/Data/HashMap/Strict/Extended.hs -+++ b/src-lib/Data/HashMap/Strict/Extended.hs -@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended - , groupOnNE - , differenceOn - , lpadZip -- , mapKeys - , unionsWith - ) where - -@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case - That b -> Just (Nothing, b) - These a b -> Just (Just a, b) - ---- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@. ---- ---- The size of the result may be smaller if @f@ maps two or more distinct ---- keys to the same new key. In this case the value at the greatest of the ---- original keys is retained. ---- ---- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")] ---- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c" ---- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c" ---- ---- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys --mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a --mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) [] -- - -- | The union of a list of maps, with a combining operation: - -- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@). - -- diff --git a/pkgs/development/misc/haskell/hasura/ekg-core.nix b/pkgs/development/misc/haskell/hasura/ekg-core.nix index 6a9b1157021e2..2d1b62bc16c78 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-core.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-core.nix @@ -1,17 +1,17 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. { mkDerivation, async, atomic-primops, base, containers, criterion -, fetchgit, generic-random, ghc-prim, hashable, hspec -, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit -, primitive, QuickCheck, smallcheck, text, unordered-containers +, fetchgit, ghc-prim, hashable, hspec, hspec-smallcheck, HUnit +, inspection-testing, lib, markdown-unlit, primitive, QuickCheck +, smallcheck, text, unordered-containers }: mkDerivation { pname = "ekg-core"; version = "0.1.1.7"; src = fetchgit { url = "https://github.com/hasura/ekg-core.git"; - sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys"; - rev = "9fc8f94685c149a909b66bad4167455d8ae1002c"; + sha256 = "1syb87iav3fgj6vqjh1izdvw4g0l4mngcyhvcg2nazisw3l685z6"; + rev = "b0cdc337ca2a52e392d427916ba3e28246b396c0"; fetchSubmodules = true; }; libraryHaskellDepends = [ @@ -19,10 +19,9 @@ mkDerivation { primitive text unordered-containers ]; testHaskellDepends = [ - async atomic-primops base containers generic-random ghc-prim - hashable hspec hspec-smallcheck HUnit inspection-testing - markdown-unlit primitive QuickCheck smallcheck text - unordered-containers + async atomic-primops base containers ghc-prim hashable hspec + hspec-smallcheck HUnit inspection-testing markdown-unlit primitive + QuickCheck smallcheck text unordered-containers ]; testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ base criterion ]; diff --git a/pkgs/development/misc/haskell/hasura/ekg-json.nix b/pkgs/development/misc/haskell/hasura/ekg-json.nix index e115e2c40b9d2..bb71aef27970d 100644 --- a/pkgs/development/misc/haskell/hasura/ekg-json.nix +++ b/pkgs/development/misc/haskell/hasura/ekg-json.nix @@ -1,6 +1,6 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text +{ mkDerivation, aeson, base, ekg-core, fetchgit, hspec, lib, text , unordered-containers, vector }: mkDerivation { @@ -8,13 +8,16 @@ mkDerivation { version = "0.1.0.7"; src = fetchgit { url = "https://github.com/hasura/ekg-json.git"; - sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v"; - rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13"; + sha256 = "17kd2f1695dmf5l95iz1w86hapc4f1gfrd0ld3ivffa2q5vxbi70"; + rev = "d1c5031b49a5559cf4b4f6beb0238b872890a48c"; fetchSubmodules = true; }; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers vector ]; + testHaskellDepends = [ + aeson base ekg-core hspec text unordered-containers + ]; homepage = "https://github.com/tibbe/ekg-json"; description = "JSON encoding of ekg metrics"; license = lib.licenses.bsd3; diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix index d5d8e693ab41a..646c576713625 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -1,39 +1,44 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding -, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update -, base, base16-bytestring, base64-bytestring, binary, byteorder -, bytestring, case-insensitive, ci-info, connection, containers -, cron, cryptonite, data-default-class, data-has, deepseq -, dependent-map, dependent-sum, directory, ekg-core, ekg-json -, exceptions, fast-logger, fetchgit, file-embed, filepath -, ghc-heap-view, graphql-parser, hashable, hashable-time, hspec -, hspec-core, hspec-expectations, hspec-expectations-lifted -, http-api-data, http-client, http-client-tls, http-conduit +{ mkDerivation, aeson, aeson-casing, aeson-qq, ansi-wl-pprint +, asn1-encoding, asn1-types, async, attoparsec, attoparsec-iso8601 +, auto-update, base, base16-bytestring, base64-bytestring, binary +, byteorder, bytestring, case-insensitive, ci-info, conduit +, connection, containers, cron, cryptonite, data-default-class +, data-has, deepseq, dependent-map, dependent-sum, directory +, either, ekg-core, ekg-json, exceptions, fast-logger, fetchgit +, file-embed, filepath, ghc-heap-view, graphql-parser, hashable +, hashable-time, haskell-src-meta, hedgehog, hspec, hspec-core +, hspec-discover, hspec-expectations, hspec-expectations-lifted +, hspec-hedgehog, hspec-wai, hspec-wai-json, http-api-data +, http-client, http-client-tls, http-conduit, http-media , http-types, immortal, insert-ordered-containers, jose -, kan-extensions, lens, lens-aeson, lib, lifted-async, lifted-base -, list-t, memory, mime-types, mmorph, monad-control, monad-loops -, monad-validate, mtl, mustache, mysql, mysql-simple -, natural-transformation, network, network-uri, odbc -, optparse-applicative, pem, pg-client, postgresql-binary -, postgresql-libpq, pretty-simple, process, profunctors, psqueues -, QuickCheck, quickcheck-instances, random, regex-tdfa -, resource-pool, retry, safe, safe-exceptions, scientific -, semialign, semigroups, semver, shakespeare, some, split -, Spock-core, stm, stm-containers, tagged, template-haskell, text -, text-builder, text-conversions, these, time, tls, transformers -, transformers-base, unix, unordered-containers, uri-encode +, kan-extensions, kriti-lang, lens, lens-aeson, lib, libyaml +, lifted-async, lifted-base, list-t, memory, mime-types, mmorph +, monad-control, monad-logger, monad-loops, monad-validate, mtl +, mustache, mysql, mysql-simple, natural-transformation, network +, network-uri, odbc, openapi3, optparse-applicative +, optparse-generic, parsec, pem, pg-client, postgresql-binary +, postgresql-libpq, postgresql-simple, pretty-simple, process +, profunctors, psqueues, QuickCheck, quickcheck-instances, random +, regex-tdfa, resource-pool, resourcet, retry, safe +, safe-exceptions, scientific, semialign, semigroups, semver +, shakespeare, some, split, Spock-core, stm, stm-containers, tagged +, template-haskell, text, text-builder, text-conversions, th-lift +, th-lift-instances, these, time, tls, tmp-postgres, transformers +, transformers-base, typed-process, unix, unliftio-core +, unordered-containers, uri-bytestring, uri-encode, url , utf8-string, uuid, validation, vector, vector-instances, wai -, warp, websockets, wreq, x509, x509-store, x509-system -, x509-validation, yaml, zlib +, wai-extra, warp, websockets, witch, wreq, x509, x509-store +, x509-system, x509-validation, yaml, zlib }: mkDerivation { pname = "graphql-engine"; version = "1.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "04ns40wk1760pxi18pyqzgrk8h28mw6402zkjc1g52ny6afchs05"; - rev = "8be851c2a1326b2caada13a3c43becd2e848db6c"; + sha256 = "1r19qw2wxzmngb6sjpin3dk6i5r491brcb0ir4g8kw9d0ic90hpy"; + rev = "1349e6cdcfdef4b06593b48fe8e2e51b9f9c94e9"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; @@ -44,22 +49,23 @@ mkDerivation { attoparsec attoparsec-iso8601 auto-update base base16-bytestring base64-bytestring binary byteorder bytestring case-insensitive ci-info connection containers cron cryptonite data-default-class - data-has deepseq dependent-map dependent-sum directory ekg-core - ekg-json exceptions fast-logger file-embed filepath ghc-heap-view - graphql-parser hashable hashable-time http-api-data http-client - http-client-tls http-conduit http-types immortal - insert-ordered-containers jose kan-extensions lens lens-aeson - lifted-async lifted-base list-t memory mime-types mmorph - monad-control monad-loops monad-validate mtl mustache mysql - mysql-simple network network-uri odbc optparse-applicative pem - pg-client postgresql-binary postgresql-libpq pretty-simple process - profunctors psqueues QuickCheck quickcheck-instances random - regex-tdfa resource-pool retry safe-exceptions scientific semialign - semigroups semver shakespeare some split Spock-core stm - stm-containers tagged template-haskell text text-builder - text-conversions these time tls transformers transformers-base unix - unordered-containers uri-encode utf8-string uuid validation vector - vector-instances wai warp websockets wreq x509 x509-store + data-has deepseq dependent-map dependent-sum directory either + ekg-core ekg-json exceptions fast-logger file-embed filepath + ghc-heap-view graphql-parser hashable hashable-time http-api-data + http-client http-client-tls http-conduit http-media http-types + immortal insert-ordered-containers jose kan-extensions kriti-lang + lens lens-aeson lifted-async lifted-base list-t memory mime-types + mmorph monad-control monad-loops monad-validate mtl mustache mysql + mysql-simple network network-uri odbc openapi3 optparse-applicative + optparse-generic parsec pem pg-client postgresql-binary + postgresql-libpq pretty-simple process profunctors psqueues + QuickCheck quickcheck-instances random regex-tdfa resource-pool + retry safe-exceptions scientific semialign semigroups semver + shakespeare some split Spock-core stm stm-containers tagged + template-haskell text text-builder text-conversions these time tls + transformers transformers-base unix unordered-containers + uri-bytestring uri-encode url utf8-string uuid validation vector + vector-instances wai warp websockets witch wreq x509 x509-store x509-system x509-validation yaml zlib ]; executableHaskellDepends = [ @@ -67,15 +73,24 @@ mkDerivation { text-conversions time unix ]; testHaskellDepends = [ - aeson base bytestring containers cron dependent-map dependent-sum - graphql-parser hspec hspec-core hspec-expectations - hspec-expectations-lifted http-client http-client-tls http-types - insert-ordered-containers jose kan-extensions lens lifted-base - mmorph monad-control mtl natural-transformation network-uri - optparse-applicative pg-client process QuickCheck safe scientific - split template-haskell text time transformers-base - unordered-containers vector + aeson aeson-casing aeson-qq async base bytestring case-insensitive + conduit containers cron dependent-map dependent-sum ekg-core + exceptions graphql-parser haskell-src-meta hedgehog hspec + hspec-core hspec-discover hspec-expectations + hspec-expectations-lifted hspec-hedgehog hspec-wai hspec-wai-json + http-client http-client-tls http-conduit http-types + insert-ordered-containers jose kan-extensions lens lens-aeson + libyaml lifted-base mmorph monad-control monad-logger mtl mysql + mysql-simple natural-transformation network network-uri odbc + optparse-applicative parsec pg-client postgresql-libpq + postgresql-simple process QuickCheck resource-pool resourcet safe + safe-exceptions scientific shakespeare split Spock-core stm + template-haskell text text-conversions th-lift th-lift-instances + time tmp-postgres transformers transformers-base typed-process unix + unliftio-core unordered-containers utf8-string vector wai wai-extra + warp websockets yaml ]; + testToolDepends = [ hspec-discover ]; doCheck = false; homepage = "https://www.hasura.io"; description = "GraphQL API over Postgres"; diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix index a447ac0154015..70024ce732c44 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -1,30 +1,29 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, attoparsec, base, bytestring, containers -, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib -, prettyprinter, scientific, template-haskell, text, text-builder -, th-lift-instances, unordered-containers, vector +{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq +, fetchgit, hashable, hedgehog, lib, prettyprinter, scientific +, tasty-bench, template-haskell, text, text-builder +, th-lift-instances, unordered-containers }: mkDerivation { pname = "graphql-parser"; version = "0.2.0.0"; src = fetchgit { url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "0zqrh7y0cjjrscsw2hmyhdcm4nzvb5pw394pcxk8q19xx13jp9xd"; - rev = "43562a5b7b41d380e3e31732b48637702e5aa97d"; + sha256 = "1xprr5wdhcfnbggkygz71v3za1mmkqv5mbm7h16kpsrhm1m9mpx8"; + rev = "c311bc15b8d8cef28a846d1d81b0bcc1d59bd956"; fetchSubmodules = true; }; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq filepath - hashable hedgehog prettyprinter scientific template-haskell text - text-builder th-lift-instances unordered-containers vector + aeson attoparsec base bytestring deepseq hashable hedgehog + prettyprinter scientific template-haskell text text-builder + th-lift-instances unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring hedgehog prettyprinter scientific text - text-builder + attoparsec base bytestring hedgehog prettyprinter text text-builder ]; benchmarkHaskellDepends = [ - base bytestring criterion prettyprinter text text-builder + base bytestring prettyprinter tasty-bench text text-builder ]; homepage = "https://github.com/hasura/graphql-parser-hs"; description = "A native Haskell GraphQL parser"; diff --git a/pkgs/development/misc/haskell/hasura/kriti-lang.nix b/pkgs/development/misc/haskell/hasura/kriti-lang.nix new file mode 100644 index 0000000000000..7e22aff40d7b4 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/kriti-lang.nix @@ -0,0 +1,41 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring +, containers, directory, fetchgit, filepath, generic-arbitrary +, happy, hspec, hspec-core, hspec-golden, lens, lens-aeson, lib +, megaparsec, mtl, network-uri, optparse-applicative, parsec +, parser-combinators, pretty-simple, prettyprinter, QuickCheck +, raw-strings-qq, safe-exceptions, scientific, text +, unordered-containers, utf8-string, vector +}: +mkDerivation { + pname = "kriti-lang"; + version = "0.3.1"; + src = fetchgit { + url = "https://github.com/hasura/kriti-lang.git"; + sha256 = "09v31xp8gkc0p0gfysxyd8yb7lyb1vpgzq8550h3s3msjbapr7pj"; + rev = "0f0b153b93af5dc6c6e995c016ca4562e8438cec"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base bytestring containers lens megaparsec mtl + network-uri optparse-applicative parser-combinators prettyprinter + scientific text unordered-containers utf8-string vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson base bytestring containers mtl optparse-applicative + prettyprinter text utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers directory filepath + generic-arbitrary hspec hspec-core hspec-golden lens lens-aeson mtl + optparse-applicative parsec pretty-simple prettyprinter QuickCheck + raw-strings-qq safe-exceptions scientific text unordered-containers + utf8-string vector + ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix index 52f179f9923ce..92d556824dbd6 100644 --- a/pkgs/development/misc/haskell/hasura/pg-client.nix +++ b/pkgs/development/misc/haskell/hasura/pg-client.nix @@ -1,10 +1,10 @@ # This has been automatically generated by the script # ./update.sh. This should not be changed by hand. -{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring -, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable -, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib -, mmorph, monad-control, mtl, postgresql, postgresql-binary -, postgresql-libpq, resource-pool, retry, scientific +{ mkDerivation, aeson, aeson-casing, async, attoparsec, base +, bytestring, ekg-core, fetchgit, file-embed, hashable, hashtables +, hasql, hasql-pool, hasql-transaction, hspec, lib, mmorph +, monad-control, mtl, postgresql-binary, postgresql-libpq +, resource-pool, retry, safe-exceptions, scientific, tasty-bench , template-haskell, text, text-builder, time, transformers-base , uuid, vector }: @@ -13,24 +13,25 @@ mkDerivation { version = "0.1.0"; src = fetchgit { url = "https://github.com/hasura/pg-client-hs.git"; - sha256 = "00h9hskv3p4mg35php5wsr2d2rjahcv29rqidb2lxl11r05psr4m"; - rev = "5e8a2d7ebe8b96518e5a70f4d61be2550eaa4e70"; + sha256 = "0ga2bj0mfng25c8kxsvi8i13pnanbnhahxvbq8ijl0bysd41g7zi"; + rev = "09b40ad8e5d16a78f5d91fe2306676f52caadbc8"; fetchSubmodules = true; }; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - aeson aeson-casing attoparsec base bytestring ekg-core hashable - hashtables mmorph monad-control mtl postgresql-binary - postgresql-libpq resource-pool retry scientific template-haskell - text text-builder time transformers-base uuid vector + aeson aeson-casing async attoparsec base bytestring ekg-core + hashable hashtables mmorph monad-control mtl postgresql-binary + postgresql-libpq resource-pool retry safe-exceptions scientific + template-haskell text text-builder time transformers-base uuid + vector + ]; + testHaskellDepends = [ + async base bytestring hspec mtl safe-exceptions time ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ base bytestring hspec mtl ]; benchmarkHaskellDepends = [ - base bytestring criterion file-embed hashable hasql hasql-pool - hasql-transaction mtl postgresql-libpq text text-builder + base bytestring file-embed hasql hasql-pool hasql-transaction mtl + tasty-bench text ]; homepage = "https://github.com/hasura/platform"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix index c03b1fb88121d..48954114a4a17 100644 --- a/pkgs/development/misc/haskell/hasura/pool.nix +++ b/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/bos/pool"; + homepage = "http://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh index 77a5d5fc6dead..f4286ea6b831e 100755 --- a/pkgs/development/misc/haskell/hasura/update.sh +++ b/pkgs/development/misc/haskell/hasura/update.sh @@ -21,12 +21,13 @@ pgclient_derivation_file="${script_dir}/pg-client.nix" pool_derivation_file="${script_dir}/pool.nix" ekgcore_derivation_file="${script_dir}/ekg-core.nix" ekgjson_derivation_file="${script_dir}/ekg-json.nix" +kritilang_derivation_file="${script_dir}/kriti-lang.nix" # TODO: get current revision of graphql-engine in Nixpkgs. # old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")" # This is the latest release version of graphql-engine on GitHub. -new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output) +new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output) echo "Running cabal2nix and outputting to ${engine_derivation_file}..." @@ -77,6 +78,15 @@ echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivati cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file" +echo "Running cabal2nix and outputting to ${kritilang_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$kritilang_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$kritilang_derivation_file" + +new_kritilang_version=$(curl --silent "https://api.github.com/repos/hasura/kriti-lang/tags" | jq '.[0].name' --raw-output) + +cabal2nix --revision "$new_kritilang_version" --maintainer lassulus "https://github.com/hasura/kriti-lang.git" >> "$kritilang_derivation_file" + echo "###################" echo "please update pkgs/servers/hasura/cli.nix vendorSha256" echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version" diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index a19a2773ce96d..48bcfe39eabd0 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0c0zn3a3bq3g13zj1b7hz1gfd9mcc5wlch80vjgp31vgm23vvd8d"; + vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60ae4faa43912..5abbb198fbaf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21485,7 +21485,7 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskellPackages.graphql-engine; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; From f10066e81b102858d8ab757db14222d751e94d5c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 4 Apr 2022 22:54:07 +0200 Subject: [PATCH 12/15] haskellPackages.jsaddle-webkit2gtk: remove obsolete patch --- .../haskell-modules/configuration-common.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b64c549f18b6..6c9f7499ce33a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2057,18 +2057,6 @@ self: super: { '' + (drv.postPatch or ""); }) (doJailbreak super.jsaddle); - # 2022-03-22: PR for haskell-gi-base compat https://github.com/ghcjs/jsaddle/pull/129 - jsaddle-webkit2gtk = - appendPatch ( - fetchpatch { - name = "haskell-gi-base-0.26-compat-patch"; - url = "https://github.com/ghcjs/jsaddle/commit/c9a9ad39addea469f7e3f5bc6b1c778fefaab5d8.patch"; - sha256 = "sha256-4njoOxtJH2jVqiPmW8f9hGUqpzI3yJ1XP4u85QgmvjU="; - relative = "jsaddle-webkit2gtk"; - } - ) - super.jsaddle-webkit2gtk; - # 2022-03-22: Jailbreak for base bound: https://github.com/reflex-frp/reflex-dom/pull/433 reflex-dom = assert super.reflex-dom.version == "0.6.1.1"; doJailbreak super.reflex-dom; From 2e8743b8e53638d8af54c74c023e0bb317557afb Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 5 Apr 2022 09:16:20 +0900 Subject: [PATCH 13/15] haskell: update link to calendar for maintainer rotation --- maintainers/scripts/haskell/merge-and-open-pr.sh | 2 +- pkgs/development/haskell-modules/HACKING.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 18db1da0f2a5b..9e6ebafaccc86 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -99,7 +99,7 @@ This PR is the regular merge of the \`haskell-updates\` branch into \`master\`. This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status). -We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) for who is currently in charge of this branch. +We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) for who is currently in charge of this branch. ### haskellPackages Workflow Summary diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 51b0abb155243..8dc5c434672df 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -345,7 +345,7 @@ Here are some additional tips that didn't fit in above. [release-haskell.nix](../../top-level/release-haskell.nix). 1. Update the - [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) + [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) and work the new member into the `haskell-updates` rotation. 1. Optionally, have the new member add themselves to the Haskell From a964dcad739fe70ed5e01646594aafdfb2be4560 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 5 Apr 2022 12:50:04 +0200 Subject: [PATCH 14/15] haskell.compiler.ghcjs: pass fetchFromGitHub to ghcjs-base Fixes evaluation of haskell.compiler.ghcjs.withPackages. Reference #158600. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 2bdf5cfbe51ed..c6e0e6a2c053d 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -19,7 +19,7 @@ self: super: jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix { - fetchgit = pkgs.buildPackages.fetchgit; + fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub; }); # GHCJS does not ship with the same core packages as GHC. From 09c8dffafcb5310e096af2af76fb35e329d47fb5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 7 Apr 2022 00:33:56 +0200 Subject: [PATCH 15/15] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../transitive-broken.yaml | 3 ++- .../haskell-modules/hackage-packages.nix | 13 ++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ba23a9a5b28ff..31a401ac8cc39 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1392,6 +1392,7 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush + - fast-tags - FastxPipe - fathead-util - fb @@ -3959,6 +3960,7 @@ broken-packages: - powerdns - powermate - powerpc + - powerqueue-levelmem - pprecord - PPrinter - pqc @@ -4705,6 +4707,7 @@ broken-packages: - socketio - sockets-and-pipes - socket-sctp + - socketson - socket-unix - sodium - soegtk @@ -5205,6 +5208,7 @@ broken-packages: - trial-tomland - trigger - trim + - tripLL - trivia - tropical - true-name diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 674735fd16e79..188e3069ede33 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -928,6 +928,7 @@ dont-distribute-packages: - cfopu - chainweb-mining-client - chalkboard-viewer + - chapelure - charade - chart-cli - chart-svg-various @@ -1354,7 +1355,6 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - espial - estimators - estreps - eternity @@ -1433,6 +1433,7 @@ dont-distribute-packages: - feed-translator - feed2lj - feed2twitter + - feedback - fei-base - fei-dataiter - fei-datasets diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 39035381aa71a..b4ceaa6556a67 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -55071,6 +55071,7 @@ self: { ]; description = "A diagnostics library for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "char-decode" = callPackage @@ -88907,7 +88908,6 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "esqueleto" = callPackage @@ -92746,6 +92746,8 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fast-tagsoup" = callPackage @@ -93884,6 +93886,7 @@ self: { executableHaskellDepends = [ base ]; description = "Declarative feedback loop manager"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "fei-base" = callPackage @@ -154009,6 +154012,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "inline-c-cpp" = callPackage @@ -154029,6 +154033,7 @@ self: { ]; description = "Lets you embed C++ code into Haskell"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roberth ]; }) {}; "inline-c-win32" = callPackage @@ -216702,6 +216707,8 @@ self: { benchmarkSystemDepends = [ leveldb snappy ]; description = "A high performance in memory and LevelDB backend for powerqueue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; "powerqueue-sqs" = callPackage @@ -253515,6 +253522,8 @@ self: { ]; description = "A small websocket backend provider"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "socks" = callPackage @@ -277971,6 +277980,8 @@ self: { ]; description = "A very simple triple store"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "triplesec" = callPackage