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

Commits on Sep 7, 2019

  1. haskellPackages: unbreak cachix build

    @marsam @peti
    marsam authored and peti committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86321d3 View commit details

  2. haskellPackages.hnix: unmark as broken

    @marsam @peti
    marsam authored and peti committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5b9baa View commit details

  3. haskellPackages.hnix-store-remote: unmark as broken

    @marsam @peti
    marsam authored and peti committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3194a1e View commit details

  4. haskell-arbtt: fix the test suite

    @peti
    peti committed Sep 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5f22000 View commit details

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

    This update was generated by hackage2nix v2.14.4-7-ga804c35 from Hackage revision
commercialhaskell/all-cabal-hashes@4cf3608.
    @peti
    peti committed Sep 7, 2019
    Copy the full SHA
    1878a24 View commit details
16 changes: 9 additions & 7 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -77,13 +77,6 @@ self: super: {
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};

# compatibility with servant-0.16.2. Remove with the next release
cachix = appendPatch super.cachix (pkgs.fetchpatch {
url = "https://github.com/cachix/cachix/commit/051679a99cd56e2497c0f05310035b6649129a13.patch";
sha256 = "198n5byp9mfiymgzpvyd42l6vqy6hfy9kdi7svfx7mcwsy7sg7kp";
stripLen = 1;
});

# Fix test trying to access /home directory
shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
@@ -1226,4 +1219,13 @@ self: super: {
# https://github.com/elliottt/hsopenid/issues/15
openid = markBroken super.openid;

# The test suite needs the packages's executables in $PATH to succeed.
arbtt = overrideCabal super.arbtt (drv: {
preCheck = ''
for i in $PWD/dist/build/*; do
export PATH="$i:$PATH"
done
'';
});

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
4 changes: 0 additions & 4 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -3097,7 +3097,6 @@ broken-packages:
- arbor-monad-metric
- arbor-monad-metric-datadog
- arbor-postgres
- arbtt
- archiver
- archlinux
- archlinux-web
@@ -3598,7 +3597,6 @@ broken-packages:
- cabin
- cabocha
- cached
- cachix
- cacophony
- caffegraph
- cairo-core
@@ -5935,8 +5933,6 @@ broken-packages:
- hmt-diagrams
- hmumps
- hnetcdf
- hnix
- hnix-store-remote
- HNM
- hnormalise
- ho-rewriting
Loading