diff options
author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ece345208af..9bc5a936e28 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1711,14 +1711,13 @@ self: super: { excludes = ["test/buildtest"]; }); - # workaround for https://github.com/peti/distribution-nixpkgs/issues/9 - pam = super.pam.override { inherit (pkgs) pam; }; - # Too strict version bounds on base: # https://github.com/obsidiansystems/database-id/issues/1 database-id-class = doJailbreak super.database-id-class; - cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { + cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override { + distribution-nixpkgs = self.distribution-nixpkgs_1_6_0; + }) { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; @@ -1869,8 +1868,6 @@ EOT # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; - hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0; - # Too strict bounds on QuickCheck # https://github.com/muesli4/table-layout/issues/16 table-layout = doJailbreak super.table-layout; |