Unverified Commit 9c7c300c authored by Dennis Gosnell's avatar Dennis Gosnell Committed by GitHub
Browse files

Merge pull request #194600 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
parents 5ec1699e e9305a37
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ commit="$(jq -r .commit.sha <<< "$head_info")"
date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
# generate nix expression from cabal file, replacing the version with the commit date
echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix
cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix
cabal2nix --subpath cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix
+27 −0
Original line number Diff line number Diff line
@@ -593,6 +593,27 @@
          module removed, due to lack of maintainers.
        </para>
      </listitem>
      <listitem>
        <para>
          <literal>generateOptparseApplicativeCompletions</literal> and
          <literal>generateOptparseApplicativeCompletion</literal> from
          <literal>haskell.lib.compose</literal> (and
          <literal>haskell.lib</literal>) have been deprecated in favor
          of <literal>generateOptparseApplicativeCompletions</literal>
          (plural!) as provided by the haskell package sets (so
          <literal>haskellPackages.generateOptparseApplicativeCompletions</literal>
          etc.). The latter allows for cross-compilation (by
          automatically disabling generation of completion in the cross
          case). For it to work properly you need to make sure that the
          function comes from the same context as the package you are
          trying to override, i.e. always use the same package set as
          your package is coming from or – even better – use
          <literal>self.generateOptparseApplicativeCompletions</literal>
          if you are overriding a haskell package set. The old functions
          are retained for backwards compatibility, but yield are
          warning.
        </para>
      </listitem>
      <listitem>
        <para>
          The <literal>services.graphite.api</literal> and
@@ -666,6 +687,12 @@
          system timezone.
        </para>
      </listitem>
      <listitem>
        <para>
          The top-level <literal>termonad-with-packages</literal> alias
          for <literal>termonad</literal> has been removed.
        </para>
      </listitem>
      <listitem>
        <para>
          (Neo)Vim can not be configured with
+11 −0
Original line number Diff line number Diff line
@@ -196,6 +196,15 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.

- `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose`
  (and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as
  provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.).
  The latter allows for cross-compilation (by automatically disabling generation of completion in the cross case).
  For it to work properly you need to make sure that the function comes from the same context as the package
  you are trying to override, i.e. always use the same package set as your package is coming from or – even
  better – use `self.generateOptparseApplicativeCompletions` if you are overriding a haskell package set.
  The old functions are retained for backwards compatibility, but yield are warning.

- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
  the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and
  `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
@@ -213,6 +222,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

- The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone.

- The top-level `termonad-with-packages` alias for `termonad` has been removed.

- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
  Use `configure.packages` instead.
- Neovim can not be configured with plug anymore (still works for vim).
+4 −4
Original line number Diff line number Diff line
{
  "commit": "3f8bc936ca1b36ede05f3cec8166c6ae6c61808d",
  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f8bc936ca1b36ede05f3cec8166c6ae6c61808d.tar.gz",
  "sha256": "0bjd6znvwipc8gd0s4bryjbcj29h1lryxc2cqy0xgy07b7dpz245",
  "msg": "Update from Hackage at 2022-10-01T15:28:21Z"
  "commit": "d9b306138608746f6f686e7f3af6f35e635eacc8",
  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d9b306138608746f6f686e7f3af6f35e635eacc8.tar.gz",
  "sha256": "11c7x0b1ivcx8z96yr7rwnsby5bmjrwsjbak2pa4kknsklxd1iba",
  "msg": "Update from Hackage at 2022-10-05T14:24:18Z"
}
+4 −3
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@
}:
mkDerivation {
  pname = "cabal2nix";
  version = "unstable-2022-07-22";
  version = "unstable-2022-10-10";
  src = fetchzip {
    url = "https://github.com/NixOS/cabal2nix/archive/e00ab24821be85cb025432f8e9c4ff56dbb00a81.tar.gz";
    sha256 = "11a5l0fdj67bpqv30af4v5zxr3c7n9p81pfs4c0d3w65bmr9sa1y";
    url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz";
    sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr";
  };
  postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
  isLibrary = true;
  isExecutable = true;
  libraryHaskellDepends = [
Loading