Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9deeaa225b5c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c848ea92d96
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 28, 2018

  1. haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16

    @peti @ElvishJerricco
    peti authored and ElvishJerricco committed Nov 28, 2018
    Copy the full SHA
    1afc9c9 View commit details

  2. Merge branch 'pr-51156' into release-18.09 

    * pr-51156:
  haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16
    @Ekleog
    Ekleog committed Nov 28, 2018
    Copy the full SHA
    aacc016 View commit details

  3. pandoc: adapt postInstall hook to embedded-data-files build 

    (cherry picked from commit b38bfe1)
    @peti
    peti committed Nov 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    965b8ec View commit details

  4. Merge pull request #51177 from peti/add-pandoc-manpage 

    pandoc: adapt postInstall hook to embedded-data-files build
    @peti
    peti authored Nov 28, 2018
    Copy the full SHA
    2c848ea View commit details
Showing with 13 additions and 9 deletions.
  1. +7 −7 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  2. +5 −1 pkgs/top-level/all-packages.nix
  3. +1 −1 pkgs/top-level/haskell-packages.nix
14 changes: 7 additions & 7 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml

compiler: ghc-8.4.3
compiler: ghc-8.4.4

core-packages:
- array-0.5.2.0
@@ -12,12 +12,12 @@ core-packages:
- deepseq-1.4.3.0
- directory-1.3.1.5
- filepath-1.4.2
- ghc-8.4.3
- ghc-boot-8.4.3
- ghc-boot-th-8.4.3
- ghc-8.4.4
- ghc-boot-8.4.4
- ghc-boot-th-8.4.4
- ghc-compact-0.1.0.0
- ghc-prim-0.5.2.0
- ghci-8.4.3
- ghci-8.4.4
- haskeline-0.7.4.2
- hpc-0.6.0.3
- integer-gmp-1.0.2.0
@@ -26,10 +26,10 @@ core-packages:
- pretty-1.1.3.6
- process-1.6.3.0
- rts-1.0
- stm-2.4.5.0
- stm-2.4.5.1
- template-haskell-2.13.0.0
- terminfo-0.4.1.1
- text-1.2.3.0
- text-1.2.3.1
- time-1.8.0.2
- transformers-0.5.5.0
- unix-2.7.2.2
6 changes: 5 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4516,6 +4516,10 @@ with pkgs;
pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
postInstall = ''
mkdir -p $out/share/man/man1
cp man/pandoc.1 $out/share/man/man1/
'';
});

pamtester = callPackage ../tools/security/pamtester { };
@@ -6717,7 +6721,7 @@ with pkgs;

haskell = callPackage ./haskell-packages.nix { };

haskellPackages = haskell.packages.ghc843.override {
haskellPackages = haskell.packages.ghc844.override {
overrides = config.haskellPackageOverrides or haskell.packageOverrides;
};

2 changes: 1 addition & 1 deletion pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ in {
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
};
ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc843;
bootPkgs = packages.ghc844;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};