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: 0e35c8af3a39
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bbde4c8e679
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 20, 2019

  1. haskellPackages.arbtt: 0.10.1 -> 0.10.2 

    This is a backport of e98e4d2 and
7c04e3e to make arbtt build again.
    @erictapen
    erictapen committed Mar 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: BE743C5DD7703515
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31a5868 View commit details

Commits on Mar 23, 2019

  1. Merge pull request #57874 from erictapen/arbtt-0.10.2 

    [19.03] haskellPackages.arbtt: 0.10.1 -> 0.10.2
    @peti
    peti authored Mar 23, 2019
    Copy the full SHA
    6bbde4c View commit details
Showing with 9 additions and 6 deletions.
  1. +7 −1 pkgs/development/haskell-modules/configuration-common.nix
  2. +2 −5 pkgs/development/haskell-modules/hackage-packages.nix
8 changes: 7 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1156,7 +1156,13 @@ self: super: {

xmonad-extras = doJailbreak super.xmonad-extras;

arbtt = doJailbreak super.arbtt;
arbtt = overrideCabal super.arbtt (drv: {
# See this for context:
# https://github.com/NixOS/nixpkgs/commit/7c04e3eb7571ad8ce31a15a22beb11bfe921a387
preCheck = ''
for n in $PWD/dist/build/*; do PATH+=":$n"; done
'';
});

# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;
7 changes: 2 additions & 5 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.