diff options
| author | John Ericson <git@JohnEricson.me> | 2021-12-26 14:07:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-26 14:07:21 -0800 |
| commit | 4104aaa7386cad089efda832536e4ee8f2fd45a9 (patch) | |
| tree | ab5607685eefab34e0a9cfa4d72813d46d30466e | |
| parent | Merge pull request #152238 from NixOS/backport-152224-to-release-21.11 (diff) | |
| parent | haskellPackages: regenerate package set based on current config (diff) | |
| download | nixpkgs-4104aaa7386cad089efda832536e4ee8f2fd45a9.tar.gz | |
Merge pull request #150915 from NixOS/backport-150635-to-release-21.11
[Backport release-21.11] haskellPackages.{github,nix-thunk}: Fix
3 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 83e9ea32509f..501cfb3b0501 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1677,12 +1677,16 @@ self: super: { # Issue reported upstream, no bug tracker url yet. darcs = doJailbreak super.darcs; - # Too strict version bounds on base16-bytestring and http-link-header. - # This patch will be merged when next release comes. - github = appendPatch (pkgs.fetchpatch { - url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch"; - sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh"; - }) super.github; + nix-thunk = appendPatches [ + (pkgs.fetchpatch { + url = "https://github.com/obsidiansystems/nix-thunk/commit/49d27a85dd39cd9413c99958c67e596756a502b5.patch"; + sha256 = "1p1n0123yrbdqyfk4kx3gq6bdv65l1bxgbsg51ckcwclg54xp2p5"; + }) + (pkgs.fetchpatch { + url = "https://github.com/obsidiansystems/nix-thunk/commit/512867c651977265d5d8f456b538f7a364ec8a8b.patch"; + sha256 = "121yg26y4g28k8xv7y1j6c3pxm17vsjn3vi62kkc8g928c47yd02"; + }) + ] super.nix-thunk; # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 951047fb54fd..91ed1edfa977 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1681,7 +1681,6 @@ broken-packages: - git-cuk - git-date - gitdo - - github - github-backup - github-data - github-tools @@ -3376,7 +3375,6 @@ broken-packages: - nix-freeze-tree - nixfromnpm - nixpkgs-update - - nix-thunk - nix-tools - nkjp - nlp-scores diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b775203566d2..46bac188e832 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -107877,8 +107877,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "github-backup" = callPackage @@ -192734,8 +192732,6 @@ self: { ]; description = "Lightweight dependency management with Nix"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nix-tools" = callPackage |