Navigation Menu

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
base: 8b04f2486e33
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2d08e57e0131
Choose a head ref
  • 15 commits
  • 6 files changed
  • 7 contributors

Commits on Mar 13, 2020

  1. LTS Haskell 15.3

    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    beeb24f View commit details
    Browse the repository at this point in the history

  2. zxcvbn-hs: unmark as broken

    @timds @peti
    timds authored and peti committed Mar 13, 2020
    Copy the full SHA
    513fa25 View commit details
    Browse the repository at this point in the history

  3. zxcvbn-dvorak: unmark as broken

    @timds @peti
    timds authored and peti committed Mar 13, 2020
    Copy the full SHA
    c2dcdea View commit details
    Browse the repository at this point in the history

  4. cabal2nix: split into a lightweight version and a wrapper 

    Current, the `cabal2nix` derivation contains both the executable, and a wrapper
that adds `nix` and `nix-prefetch-scripts`, which are required for some
features.

However, when calling `callCabal2nix` to create a derivation from a cabal file
at evaluation time,
these features are not actually used, but the huge closure of
`nix-prefetch-scripts` (which includes multiple vcs, as well as python and perl)
still needs to be fetched.

This commit splits cabal2nix into a lightweight version that is a standalone
static binary (`cabal2nix-unwrapped`), and a wrapper that includes the proper
dependencies in the path for full usage of the command line
utility (`cabal2nix`).

This commit also switches to the default ghc, to reduce the likelyhood of
building a different ghc when calling `callCabal2nix`.
    @madjar @peti
    madjar authored and peti committed Mar 13, 2020
    Copy the full SHA
    2645e1a View commit details
    Browse the repository at this point in the history

  5. Remove snap from broken packages list

    @imalsogreg @peti
    imalsogreg authored and peti committed Mar 13, 2020
    Copy the full SHA
    14f213a View commit details
    Browse the repository at this point in the history

  6. saltine: fix build by disabling tests 

    The tests fail to compile because of a missing module but would
otherwise be fine.
    @timds @peti
    timds authored and peti committed Mar 13, 2020
    Copy the full SHA
    720d0c7 View commit details
    Browse the repository at this point in the history

  7. persistent-mysql: fix build 

    tests need a running mysql instance, so disable them
    @jerith666 @peti
    jerith666 authored and peti committed Mar 13, 2020
    Copy the full SHA
    7335de2 View commit details
    Browse the repository at this point in the history

  8. ats-pkg: Unbreak by disabling tests

    @peti
    Poscat authored and peti committed Mar 13, 2020
    Copy the full SHA
    d0eb52f View commit details
    Browse the repository at this point in the history

  9. Unbreak ats-format

    @peti
    Poscat authored and peti committed Mar 13, 2020
    Copy the full SHA
    ef65c63 View commit details
    Browse the repository at this point in the history

  10. haskellPackages.EdisonCore: Unbreak 

    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk @peti
    andersk authored and peti committed Mar 13, 2020
    Copy the full SHA
    838c7a8 View commit details
    Browse the repository at this point in the history

  11. haskellPackages: update default compiler from GHC version 8.8.2 to 8.8.3

    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    9bcd5ea View commit details
    Browse the repository at this point in the history

  12. hackage2nix: update list of broken packages to fix evaluation

    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    68dba0d View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.15.0-21-ga388e13 from Hackage revision
commercialhaskell/all-cabal-hashes@a155538.
    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    eb8d577 View commit details
    Browse the repository at this point in the history

  14. git-annex: update sha256 hash for new version 8.20200309

    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    d02ac6c View commit details
    Browse the repository at this point in the history

  15. Merge pull request #82345 from NixOS/haskell-updates 

    Update Haskell package set to LTS 15.3 (plus other fixes)
    @peti
    peti committed Mar 13, 2020
    Copy the full SHA
    2d08e57 View commit details
    Browse the repository at this point in the history