Skip to content
This repository has been 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
base: 4056c436c983
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 2b9916c715d2
Choose a head ref
  • 20 commits
  • 11 files changed
  • 8 contributors

Commits on Nov 4, 2018

  1. phototonic: 1.7.1 -> 2.1

    @woffs
    woffs committed Nov 4, 2018
    Copy the full SHA
    fc84be0 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. Merge pull request #49751 from woffs/phototonic-2.1 

    phototonic: 1.7.1 -> 2.1
    @pSub
    pSub committed Nov 5, 2018
    Copy the full SHA
    c7a5b77 View commit details
    Browse the repository at this point in the history

  2. Revert "NixOS tests: Wait for shell for 10x longer (50m)" 

    This reverts commit 9bc10e1.
    @srhb
    srhb committed Nov 5, 2018
    Copy the full SHA
    95486ca View commit details
    Browse the repository at this point in the history

  3. haskell-cpython: revert "set to null" 

    This reverts commit 6a0b1b1. Please don't null
out the entire package just because its build is broken at the moment. If you
want to prevent users from compiling cpython, then haskell.lib.markBroken (or,
even better: markBrokenVersion) are the way to do it.
    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    4f45edb View commit details
    Browse the repository at this point in the history

  4. ghc-8.4.4: disable integer-simple variant build 

    The build fails: https://hydra.nixos.org/build/83750830
    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    b854f78 View commit details
    Browse the repository at this point in the history

  5. nixos/rngd: do not pass --version flag

    @gebner
    gebner committed Nov 5, 2018
    Copy the full SHA
    20078fd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #49777 from srhb/restore-test-timeout 

    Revert "NixOS tests: Wait for shell for 10x longer (50m)"
    @Mic92
    Mic92 committed Nov 5, 2018
    Copy the full SHA
    3111235 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #49778 from gebner/rngd-version 

    nixos/rngd: do not pass --version flag
    @gebner
    gebner committed Nov 5, 2018
    Copy the full SHA
    57dd484 View commit details
    Browse the repository at this point in the history

  8. linux: 4.19-rc8 -> 4.20-rc1

    @NeQuissimus
    NeQuissimus committed Nov 5, 2018
    Copy the full SHA
    4745250 View commit details
    Browse the repository at this point in the history

  9. haskell-cpython: don't bind the obsolete name "python34" 

    Fixes the evaluation error introduced by 4f45edb.
    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    ff060e7 View commit details
    Browse the repository at this point in the history

  10. ghc-8.2.1-binary: Patch shebang causing failures in Centos 6

    @unode @peti
    unode authored and peti committed Nov 5, 2018
    Copy the full SHA
    3bcdb39 View commit details
    Browse the repository at this point in the history

  11. hackage2nix: disable failing Hydra builds

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    68b1d62 View commit details
    Browse the repository at this point in the history

  12. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.11.1-3-gc8d18e2 from Hackage revision
commercialhaskell/all-cabal-hashes@01afc16.
    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    d15d643 View commit details
    Browse the repository at this point in the history

  13. haskell-hpack: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    db203c8 View commit details
    Browse the repository at this point in the history

  14. haskell-hspec: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    748ea69 View commit details
    Browse the repository at this point in the history

  15. haskell-hspec-core: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    627624f View commit details
    Browse the repository at this point in the history

  16. haskell-hspec-discover: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    72825b5 View commit details
    Browse the repository at this point in the history

  17. haskell-hspec: update overrides for the new version some more

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    0a74322 View commit details
    Browse the repository at this point in the history

  18. haskell-vty: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    90acab5 View commit details
    Browse the repository at this point in the history

  19. haskell-pandoc: update overrides for the new version

    @peti
    peti committed Nov 5, 2018
    Copy the full SHA
    2b9916c View commit details
    Browse the repository at this point in the history