Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10ec99b0de64
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e8da16ac7d2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 11, 2020

  1. Enable meta.hydraPlatforms for Haskell overrides to the latest version. 

    We distribute some packages in their respective latest version even though
Stackage LTS says that we should use an older one. These packages need to have
their meta.hydraPlatforms attribute populated or Nixpkgs will fail to build it
release tarball. This happened most recently with Pandoc, which was updated
to the latest 2.10.1 version without fixing up meta.hydraPlatforms.
    @peti
    peti committed Sep 11, 2020

    Partially verified

    This commit is signed with the committer’s verified signature.
    domenkozar’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    0e8da16 View commit details
Showing with 8 additions and 8 deletions.
  1. +8 −8 pkgs/development/haskell-modules/configuration-common.nix
16 changes: 8 additions & 8 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1459,16 +1459,16 @@ self: super: {

# We want the latest version of cryptonite. This is a first step towards
# resolving https://github.com/NixOS/nixpkgs/issues/81915.
cryptonite = self.cryptonite_0_27;
cryptonite = doDistribute self.cryptonite_0_27;

# We want the latest version of Pandoc.
hslua = self.hslua_1_1_2;
jira-wiki-markup = self.jira-wiki-markup_1_3_2;
pandoc = self.pandoc_2_10_1;
pandoc-citeproc = self.pandoc-citeproc_0_17_0_2;
pandoc-plot = self.pandoc-plot_0_9_2_0;
pandoc-types = self.pandoc-types_1_21;
rfc5051 = self.rfc5051_0_2;
hslua = doDistribute self.hslua_1_1_2;
jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2;
pandoc = doDistribute self.pandoc_2_10_1;
pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2;
pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0;
pandoc-types = doDistribute self.pandoc-types_1_21;
rfc5051 = doDistribute self.rfc5051_0_2;

# INSERT NEW OVERRIDES ABOVE THIS LINE