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: caf7725f9583
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea71b0aa913b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on May 4, 2021

  1. top-level/release-haskell.nix: add less obvious top-level haskell pkgs 

    These were found by grepping for haskellPackages in the whole
repository.
    @sternenseemann
    sternenseemann committed May 4, 2021

    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
    6784d2b View commit details

  2. top-level/release-haskell.nix: use top-level git-annex attribute 

    This saves us from the annoyances of the gitAndTools attribute set which
doesn't have recurseForDerivations and is thus ignored by
packagePlatforms.
    @sternenseemann
    sternenseemann committed May 4, 2021
    Copy the full SHA
    07dd4a9 View commit details

  3. top-level/release-haskell.nix: also tests writers tests 

    This should show us what impact our changes have on writeHaskell.
    @sternenseemann
    sternenseemann committed May 4, 2021
    Copy the full SHA
    ea71b0a View commit details
Showing with 26 additions and 5 deletions.
  1. +26 −5 pkgs/top-level/release-haskell.nix
31 changes: 26 additions & 5 deletions pkgs/top-level/release-haskell.nix
View file
Original file line number Diff line number Diff line change
@@ -67,9 +67,7 @@ let
};

# hydra jobs for `pkgs` of which we import a subset of
pkgsPlatforms = packagePlatforms pkgs // {
gitAndTools = packagePlatforms pkgs.gitAndTools;
};
pkgsPlatforms = packagePlatforms pkgs;

# names of packages in an attribute set that are maintained
maintainedPkgNames = set: builtins.attrNames
@@ -81,19 +79,28 @@ let
haskellPackages = packagePlatforms pkgs.haskellPackages;
haskell.compiler = packagePlatforms pkgs.haskell.compiler;

tests.haskell = packagePlatforms pkgs.tests.haskell;
tests = let
testPlatforms = packagePlatforms pkgs.tests;
in {
haskell = testPlatforms.haskell;
writers = testPlatforms.writers;
};

# top-level packages that depend on haskellPackages
inherit (pkgsPlatforms)
agda
arion
bench
bustle
blucontrol
cabal-install
cabal2nix
cachix
carp
cedille
client-ip-echo
darcs
dconf2nix
dhall
dhall-bash
dhall-docs
@@ -106,13 +113,16 @@ let
fffuu
futhark
ghcid
git-annex
git-brunch
gitit
glirc
hadolint
haskell-ci
haskell-language-server
hasura-graphql-engine
hci
hercules-ci-agent
hinit
hedgewars
hledger
@@ -130,27 +140,34 @@ let
jl
koka
krank
lambdabot
ldgallery
madlang
matterhorn
mueval
neuron-notes
niv
nix-delegate
nix-deploy
nix-diff
nix-linter
nix-output-monitor
nix-script
nix-tree
nixfmt
nota
ormolu
pandoc
pakcs
petrinizer
place-cursor-at
pinboard-notes-backup
pretty-simple
shake
shellcheck
sourceAndTags
spacecookie
spago
splot
stack
stack2nix
@@ -163,14 +180,17 @@ let
tldr-hs
tweet-hs
update-nix-fetchgit
uqm
uuagc
vaultenv
wstunnel
xmobar
xmonad-with-packages
yi
zsh-git-prompt
;

gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;
elmPackages.elm = pkgsPlatforms.elmPackages.elm;
} // versionedCompilerJobs {
# Packages which should be checked on more than the
# default GHC version. This list can be used to test
@@ -201,6 +221,7 @@ let
constituents = accumulateDerivations [
# haskell specific tests
jobs.tests.haskell
jobs.tests.writers # writeHaskell{,Bin}
# important top-level packages
jobs.cabal-install
jobs.cabal2nix