Skip to content

[#72] Fix strange GHC error when building with nixos-unstable #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-and-witch merged 1 commit into from
Jan 7, 2023
Merged

[#72] Fix strange GHC error when building with nixos-unstable #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,19 @@ jobs:
cabal:
- '3.4'
ghc:
- '9.4.4'
- '9.2.5'
- '9.0.2'
- '8.10.7'
- '8.8.4'
- '8.6.5'
build-nix:
"runs-on": "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: cachix/install-nix-action@v17
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- name: check it build with nix
run: nix build
name: Haskell CI
'on':
- push
- pull_request
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

utils.url = "github:numtide/flake-utils";
};
Expand All @@ -16,13 +16,13 @@

haskellPackages = pkgsOld.haskellPackages.override (old: {
overrides = self: super: {
nix-diff =
nix-diff =
# There are quick check and golden tests.
# Quick check tests require random source to work.
# Golden tests require write access to the /nix/var
# and read access to the test data into /nix/store
# So we can't run these tests in build time
pkgsNew.haskell.lib.dontCheck
pkgsNew.haskell.lib.dontCheck
(self.callCabal2nix "nix-diff" ./. {});
};
});
Expand Down
6 changes: 3 additions & 3 deletions nix-diff.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ maintainer: GenuineGabriella@gmail.com
copyright: 2017 Gabriella Gonzalez
category: System
build-type: Simple
tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.8.3
tested-with: GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.5, GHC == 9.4.4
cabal-version: >= 1.10
extra-source-files: README.md
CHANGELOG.md
Expand All @@ -33,7 +33,7 @@ library
, nix-derivation >= 1.1 && < 1.2
, optparse-applicative >= 0.14.0.0 && < 0.18
, patience >= 0.3 && < 0.4
, text >= 1.2 && < 1.3
, text >= 1.2 && < 2.1
, vector >= 0.12 && < 0.13
, process < 1.7
, filepath < 1.5
Expand All @@ -52,7 +52,7 @@ executable nix-diff
, nix-diff
, aeson
, bytestring
, optparse-applicative >= 0.14.0.0 && < 0.17
, optparse-applicative >= 0.14.0.0 && < 0.18
, text
, unix < 2.8
, containers
Expand Down
8 changes: 4 additions & 4 deletions src/Nix/Diff/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
{-# LANGUAGE DeriveTraversable #-}
{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE FlexibleInstances #-}
{-# OPTIONS_GHC -Wno-orphans #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE FlexibleInstances #-}
{-# OPTIONS_GHC -Wno-orphans -fconstraint-solver-iterations=0 #-}

module Nix.Diff.Types where

Expand Down