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: 88d897737f83
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7029177e3137
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 8, 2020

  1. haskellPackages.tensorflow: Update dependencies 

    This is the first step towards unbreaking the tensorflow packages.
    @mikesperber
    mikesperber committed Apr 8, 2020
    Copy the full SHA
    88578ec View commit details

Commits on Apr 9, 2020

  1. Merge pull request #84720 from mikesperber/unbreak-tensorflow-haskell-1 

    Unbreak tensorflow haskell 1
    @cdepillabout
    cdepillabout authored Apr 9, 2020
    Copy the full SHA
    7029177 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
11 changes: 7 additions & 4 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2385,8 +2385,9 @@ extra-packages:
- http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
- inline-c < 0.6 # required on GHC 8.0.x
- inline-c-cpp < 0.2 # required on GHC 8.0.x
- lens-family ==1.2.3 # required for tensorflow
- lens-family-core ==1.2.3 # required for tensorflow
- lens-labels == 0.1.* # required for proto-lens-descriptors
- mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0
- megaparsec >= 7.0.4 && < 8 # required for idris: https://github.com/idris-lang/Idris-dev/issues/4826
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
@@ -2399,9 +2400,11 @@ extra-packages:
- persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227
- prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0
- primitive == 0.5.1.* # required to build alex with GHC 6.12.3
- proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens == 0.5.* # required for tensorflow-proto
- proto-lens-protobuf-types == 0.5.* # required for tensorflow-proto
- proto-lens-protoc == 0.5.* # required for tensorflow-proto
- proto-lens-runtime == 0.5.* # required for tensorflow-proto
- proto-lens-setup == 0.4.0.2 # required for tensorflow-proto
- QuickCheck < 2 # required by test-framework-quickcheck and its users
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227