Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-02 20:25:05 +00:00 committed by GitHub
commit 825cffa5ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 1759 additions and 1157 deletions

View file

@ -760,6 +760,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
# channel and NixOS images.
};
unicode-dfs-2015 = spdx {
spdxId = "Unicode-DFS-2015";
fullName = "Unicode License Agreement - Data Files and Software (2015)";
};
unicode-dfs-2016 = spdx {
spdxId = "Unicode-DFS-2016";
fullName = "Unicode License Agreement - Data Files and Software (2016)";

View file

@ -12,8 +12,18 @@
</para>
</listitem>
</itemizedlist>
<section xml:id="highlights">
<title>Highlights</title>
<para>
</para>
</section>
<section xml:id="new-services">
<title>New Services</title>
<para>
</para>
</section>
<section xml:id="backward-incompatibilities">
<title>Backward incompatibilities</title>
<title>Backward Incompatibilities</title>
<itemizedlist spacing="compact">
<listitem>
<para>
@ -23,4 +33,9 @@
</listitem>
</itemizedlist>
</section>
<section xml:id="other-notable-changes">
<title>Other Notable Changes</title>
<para>
</para>
</section>
</section>

View file

@ -4,6 +4,12 @@ In addition to numerous new and upgraded packages, this release has the followin
* Support is planned until the end of April 2022, handing over to 22.05.
## Backward incompatibilities
## Highlights
## New Services
## Backward Incompatibilities
* The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0
## Other Notable Changes

View file

@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with pkgs; [
python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame
python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame
];
# There are no tests

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "openrgb";
version = "0.5";
version = "0.6";
src = fetchFromGitLab {
owner = "CalcProgrammer1";
repo = "OpenRGB";
rev = "release_${version}";
sha256 = "001x2ycfmlb9s21sp91aw5gxizcn6kzm8x7bvkps4b1iq0ap5fzv";
sha256 = "sha256-x/wGD39Jm/kmcTEZP3BnLXxyv/jkPOJd6mLCO0dp5wM=";
};
nativeBuildInputs = [ qmake pkg-config ];

View file

@ -70,10 +70,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v3.39.0",
"sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg",
"vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb",
"version": "3.39.0"
"rev": "v3.43.0",
"sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj",
"vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk",
"version": "3.43.0"
},
"azuread": {
"owner": "hashicorp",

View file

@ -1,7 +1,7 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
setuptools, fetchpatch,
setuptools, fetchpatch, installShellFiles,
pytest, faker, pytest-aiohttp, aioresponses,
@ -56,6 +56,10 @@ buildPythonApplication rec {
aioresponses
];
nativeBuildInputs = [
installShellFiles
];
# darwin has difficulty communicating with server, fails some integration tests
doCheck = !stdenv.isDarwin;
@ -63,6 +67,10 @@ buildPythonApplication rec {
pytest
'';
postInstall = ''
installManPage docs/man/*.[1-9]
'';
meta = with lib; {
description = "An end-to-end encryption aware Matrix reverse proxy daemon";
homepage = "https://github.com/matrix-org/pantalaimon";

View file

@ -544,7 +544,7 @@ rec {
passthru.layer = layer;
passthru.imageTag =
if tag != null
then lib.toLower tag
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
# Docker can't be made to run darwin binaries

View file

@ -1,6 +1,6 @@
{
"commit": "2295bd36e0d36af6e862dfdb7b0694fba2e7cb58",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2295bd36e0d36af6e862dfdb7b0694fba2e7cb58.tar.gz",
"sha256": "1bzqy6kbw0i1ryg3ia5spg6m62zkc46xhhn0h76pfq7mfmm3fqf8",
"msg": "Update from Hackage at 2021-05-12T11:46:04Z"
"commit": "0fb7f9edea05a2b464b5667debe1e3ece585c185",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fb7f9edea05a2b464b5667debe1e3ece585c185.tar.gz",
"sha256": "01rzbda8g62gj2x3if46lglis9gqw3qfpqyiv2lrnm7alsg36ld9",
"msg": "Update from Hackage at 2021-05-19T07:17:55Z"
}

View file

@ -212,6 +212,9 @@ stdenv.mkDerivation rec {
passthru = {
targetPrefix = "";
enableShared = true;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
};
meta = rec {

View file

@ -171,6 +171,9 @@ stdenv.mkDerivation rec {
passthru = {
targetPrefix = "";
enableShared = true;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
};
meta = rec {

View file

@ -0,0 +1,270 @@
## Maintainer Workflow
The goal of the [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell)
team is to keep the Haskell packages in Nixpkgs up-to-date, while making sure
there are no Haskell-related evaluation errors or build errors that get into
the Nixpkgs `master` branch.
We do this by periodically merging an updated set of Haskell packages on the
`haskell-updates` branch into the `master` branch. Each member of the team
takes a two week period where they are in charge of merging the
`haskell-updates` branch into `master`. This is the documentation for this
workflow.
The workflow generally proceeds in three main steps:
1. create the initial `haskell-updates` PR, and update Stackage and Hackage snapshots
1. wait for contributors to fix newly broken Haskell packages
1. merge `haskell-updates` into `master`
Each of these steps is described in a separate section.
### Initial `haskell-updates` PR
In this section we create the PR for merging `haskell-updates` into `master`.
1. Make sure the `haskell-updates` branch is up-to-date with `master`.
1. Update the Stackage Nightly resolver used by Nixpkgs and create a commit:
```console
$ ./maintainers/scripts/haskell/update-stackage.sh --do-commit
```
1. Update the Hackage package set used by Nixpkgs and create a commit:
```console
$ ./maintainers/scripts/haskell/update-hackage.sh --do-commit
```
1. Regenerate the Haskell package set used in Nixpkgs and create a commit:
```console
$ ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit
```
1. Push these commits to the Nixpkgs repository.
1. Open a PR on Nixpkgs merging `haskell-updates` into `master`.
Use the following message body:
```markdown
### This Merge
This PR is the regular merge of the `haskell-updates` branch into `master`.
This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
I will aim to merge this PR **by 2021-TODO-TODO**. If I can merge it earlier, there might be successor PRs in that time window. As part of our rotation @TODO will continue these merges from 2021-TODO-TODO to 2021-TODO-TODO.
### haskellPackages Workflow Summary
Our workflow is currently described in
[`pkgs/development/haskell-modules/HACKING.md`](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/HACKING.md).
The short version is this:
* We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window).
* The community fixes builds of Haskell packages on that branch.
* We aim at at least one merge of `haskell-updates` into `master` every two weeks.
* We only do the merge if the `mergeable` job is succeeding on hydra.
* If a maintained package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
---
This is the follow-up to #TODO.
```
Make sure to replace all TODO with the actual values.
### Notify Maintainers and Fix Broken Packages
After you've done the previous steps, Hydra will start building the new and
updated Haskell packages. You can see the progress Hydra is making at
https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. This Hydra jobset is
defined in the file [release-haskell.nix](../../top-level/release-haskell.nix).
#### Notify Maintainers
When Hydra finishes building all the updated packages for the `haskell-updates`
jobset, you should generate a build report to notify maintainers of their
newly broken packages. You can do that with the following commands:
```console
$ ./maintainers/scripts/haskell/hydra-report.hs get-report
$ ./maintainers/scripts/haskell/hydra-report.hs ping-maintainers
```
The `hyda-report.hs ping-maintainers` command generates a Markdown document
that you can paste in a GitHub comment on the PR opened above. This
comment describes which Haskell packages are now failing to build. It also
pings the maintainers so that they know to fix up their packages.
It may be helpful to pipe `hydra-report.hs ping-maintainers` into `xclip`
(XOrg) or `wl-copy` (Wayland) in order to post on GitHub.
This build report can be fetched and re-generated for new Hydra evaluations.
It may help contributors to try to keep the GitHub comment updated with the
most recent build report.
Maintainers should be given at least 7 days to fix up their packages when they
break. If maintainers don't fix up their packages with 7 days, then they
may be marked broken before merging `haskell-updates` into `master`.
#### Fix Broken Packages
After getting the build report, you can see which packages and Hydra jobs are
failing to build. The most important jobs are the `maintained` and `mergeable`
jobs. These are both defined in
[`release-haskell.nix`](../../top-level/release-haskell.nix).
`mergeable` is a set of the most important Haskell packages, including things
like Pandoc and XMonad. These packages are widely used. We would like to
always keep these building.
`maintained` is a set of Haskell packages that have maintainers in Nixpkgs.
We should be proactive in working with maintainers to keep their packages
building.
Steps to fix Haskell packages that are failing to build is out of scope for
this document, but it usually requires fixing up dependencies that are now
out-of-bounds.
#### Mark Broken Packages
Packages that do not get fixed can be marked broken with the following
commands. First check which packages are broken:
```console
$ ./maintainers/scripts/haskell/hydra-report.hs get-report
$ ./maintainers/scripts/haskell/hydra-report.hs mark-broken-list
```
This shows a list of packages that reported a build failure on `x86_64-linux` on Hydra.
Next, run the following command:
```console
$ ./maintainers/scripts/haskell/mark-broken.sh --do-commit
```
This first opens up an editor with the broken package list. Some of these
packages may have a maintainer in Nixpkgs. If these maintainers have not been
given 7 days to fix up their package, then make sure to remove those packages
from the list before continuing. After saving and exiting the editor, the
following will happen:
- Packages from the list will be added to
[`configuration-hackage2nix/broken.yaml`](configuration-hackage2nix/broken.yaml).
This is a list of Haskell packages that are known to be broken.
- [`hackage-packages.nix`](hackage-packages.nix) will be regenerated. This
will mark all Haskell pacakges in `configuration-hackage2nix/broken.yaml`
as `broken`.
- The
[`configuration-hackage2nix/transitive-broken.yaml`](configuration-hackage2nix/transitive-broken.yaml)
file will be updated. This is a list of Haskell packages that
depend on a package in `configuration-hackage2nix/broken.yaml` or
`configuration-hackage2nix/transitive-broken.yaml`
- `hackage-packages.nix` will be regenerated again. This will set
`hydraPlatforms = none` for all the packages in
`configuration-hackage2nix/transitive-broken.yaml`. This makes
sure that Hydra does not try to build any of these packages.
- All updated files will be committed.
#### Merge `master` into `haskell-updates`
You should occasionally merge the `master` branch into the `haskell-updates`
branch.
In an ideal world, when we merge `haskell-updates` into `master`, it would
cause few Hydra rebuilds on `master`. Ideally, the `nixos-unstable` channel
would never be prevented from progressing because of needing to wait for
rebuilding Haskell packages.
In order to make sure that there are a minimal number of rebuilds after merging
`haskell-updates` into `master`, `master` should occasionally be merged into
the `haskell-updates` branch.
This is especially important after `staging-next` is merged into `master`,
since there is a high chance that this will cause all the Haskell packages to
rebuild.
### Merge `haskell-updates` into `master`
Now it is time to merge the `haskell-updates` PR you opened above.
Before doing this, make sure of the following:
- All Haskell packages that fail to build are correctly marked broken or
transitively broken.
- The `maintained` and `mergeable` jobs are passing on Hydra.
- The maintainers for any maintained Haskell packages that are newly broken
have been pinged on GitHub and given at least a week to fix their packages.
This is especially important for widely-used packages like `cachix`.
- Make sure you first merge the `master` branch into `haskell-updates`. Wait
for Hydra to evaluate the new `haskell-updates` jobset. Make sure you only
merge `haskell-updates` into `master` when there are no evaluation errors.
When you've double-checked these points, go ahead and merge the `haskell-updates` PR.
After merging, **make sure not to delete the `haskell-updates` branch**, since it
causes all currently open Haskell-related pull-requests to be automatically closed on GitHub.
### Additional Info
Here are some additional tips that didn't fit in above.
- Hydra tries to evalute the `haskell-updates` branch (in the
[`nixpkgs:haskell-updates`](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)
jobset) every 4 hours. It is possible to force a new Hydra evaluation without
waiting 4 hours by the following steps:
1. Log into Hydra with your GitHub or Google account.
1. Go to the [nixpkgs:haskell-updates](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates) jobset.
1. Click the `Actions` button.
1. Select `Evaluate this jobset`.
1. If you refresh the page, there should be a new `Evaluation running since:` line.
1. Evaluations take about 10 minutes to finish.
- It is sometimes helpful to update the version of
[`cabal2nix` / `hackage2nix`](https://github.com/NixOS/cabal2nix) that our
maintainer scripts use. This can be done with the
[`maintainers/scripts/haskell/update-cabal2nix-unstable.sh`](../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh)
script.
You might want to do this if a user contributes a fix to `cabal2nix` that
will immediately fix a Haskell package in Nixpkgs. First, merge in
the PR to `cabal2nix`, then run `update-cabal2nix-upstable.sh`. Finally, run
[`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh)
to regenerate the Hackage package set with the updated version of `hackage2nix`.
- Make sure never to update the Hackage package hashes in
[`pkgs/data/misc/hackage/`](../../../pkgs/data/misc/hackage/), or the
pinned Stackage Nightly versions on the release branches (like
`release-21.05`).
This means that the
[`update-hackage.sh`](../../../maintainers/scripts/haskell/update-hackage.sh)
and
[`update-stackage.sh`](../../../maintainers/scripts/haskell/update-stackage.sh)
scripts should never be used on the release branches.
However, changing other files in `./.` and regenerating the package set is encouraged.
This can be done with
[`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh)
as described above.
- The Haskell team members generally hang out in the Matrix room
[#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org).
## Contributor Workflow
(TODO: this section is to describe the type of workflow for non-committers to
contribute to `haskell-updates`)

View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-05-06";
version = "unstable-2021-05-28";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz";
sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1";
url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz";
sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l";
};
isLibrary = true;
isExecutable = true;

View file

@ -86,6 +86,7 @@ self: super: {
yesod-paginator = dontCheck super.yesod-paginator;
grammatical-parsers = dontCheck super.grammatical-parsers;
construct = dontCheck super.construct;
orbits = dontCheck super.orbits;
# https://github.com/ekmett/half/issues/35
half = dontCheck super.half;

View file

@ -211,6 +211,9 @@ self: super: {
sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6";
})
] ++ (drv.patches or []);
# make sure patches are not broken by cabal file revisions
revision = null;
editedCabalFile = null;
}));
# Fails for non-obvious reasons while attempting to use doctest.
@ -272,9 +275,6 @@ self: super: {
github-rest = dontCheck super.github-rest; # test suite needs the network
gitlib-cmdline = dontCheck super.gitlib-cmdline;
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
#next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds
#should be fixed soon. maybe even before this is merged. currently glirc is 2.37
glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; });
hackport = dontCheck super.hackport;
hadoop-formats = dontCheck super.hadoop-formats;
haeredes = dontCheck super.haeredes;
@ -548,10 +548,7 @@ self: super: {
elm-yesod = markBroken super.elm-yesod;
# https://github.com/Euterpea/Euterpea2/issues/40
Euterpea = appendPatch super.Euterpea (pkgs.fetchpatch {
url = "https://github.com/Euterpea/Euterpea2/pull/38.patch";
sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0";
});
Euterpea = doJailbreak super.Euterpea;
# Install icons, metadata and cli program.
bustle = overrideCabal super.bustle (drv: {
@ -950,16 +947,7 @@ self: super: {
# https://github.com/commercialhaskell/stackage/issues/5795
# This issue can be mitigated with 'dontCheck' which skips the tests and their compilation.
dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json);
# dhall-nix, dhall-nixpkgs: pull updated cabal files with updated bounds.
# Remove at next hackage update.
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (overrideCabal super.dhall-nix {
revision = "2";
editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx";
});
dhall-nixpkgs = overrideCabal super.dhall-nixpkgs {
revision = "1";
editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg";
};
dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix;
dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml;
# https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
@ -1156,6 +1144,23 @@ self: super: {
# Therefore we jailbreak it.
hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
# Jailbreak due to bounds on multiple dependencies,
# bound on pandoc needs to be patched since it is conditional
hakyll = doJailbreak (overrideCabal super.hakyll (drv: {
patches = [
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch";
sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ=";
})
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch";
sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44=";
})
];
}));
# 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71
nixfmt = doJailbreak super.nixfmt;
@ -1207,14 +1212,10 @@ self: super: {
hasql-notifications = dontCheck super.hasql-notifications;
hasql-pool = dontCheck super.hasql-pool;
# This bumps optparse-applicative to <0.16 in the cabal file, as otherwise
# the version bounds are not satisfied. This can be removed if the PR at
# https://github.com/ananthakumaran/webify/pull/27 is merged and a new
# release of webify is published.
webify = appendPatch super.webify (pkgs.fetchpatch {
url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch";
sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2";
});
# We jailbreak webify, as optparse-applicative evolved past the version bound
# and the corresponding (and outdated) PR was not merged for a year.
# https://github.com/ananthakumaran/webify/pull/27
webify = doJailbreak super.webify;
# hasnt bumped upper bounds
# upstream: https://github.com/obsidiansystems/which/pull/6
@ -1308,20 +1309,6 @@ self: super: {
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/gtk-sni-tray/pull/25
gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch {
url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch";
sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn";
});
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/taffybar/pull/507
taffybar = appendPatch super.taffybar (pkgs.fetchpatch {
url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch";
sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0";
});
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv;
@ -1471,9 +1458,6 @@ self: super: {
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0);
# 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562
# Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595
@ -1870,13 +1854,15 @@ self: super: {
doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux";
};
# Fix build failure by picking patch from 8.5,
# we need this version of sbv for petrinizer
sbv_7_13 = appendPatch super.sbv_7_13
(pkgs.fetchpatch {
url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch";
sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
});
# * Fix build failure by picking patch from 8.5, we need
# this version of sbv for petrinizer
# * Pin version of crackNum that still exposes its library
sbv_7_13 = appendPatch (super.sbv_7_13.override {
crackNum = self.crackNum_2_4;
}) (pkgs.fetchpatch {
url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch";
sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
});
# Too strict bounds on dimensional
# https://github.com/enomsg/science-constants-dimensional/pull/1
@ -1891,18 +1877,6 @@ self: super: {
gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
# Test assets missing from sdist
# https://github.com/hadolint/language-docker/issues/63
language-docker = overrideSrc super.language-docker {
src = pkgs.fetchFromGitHub {
owner = "hadolint";
repo = "language-docker";
rev = "refs/tags/${super.language-docker.version}";
sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8";
name = "language-docker-${super.language-docker.version}-source";
};
};
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;
@ -1950,4 +1924,73 @@ EOT
# https://github.com/kcsongor/generic-lens/issues/133
generic-optics = dontCheck super.generic-optics;
# 2021-05-19: Allow random 1.2.0
# Remove at (presumably next release) which is > 1.3.1.0
hashable = overrideCabal super.hashable (drv: {
patches = [
(pkgs.fetchpatch {
url = "https://github.com/haskell-unordered-containers/hashable/commit/78fa8fdb4f8bec5d221f34110d6afa0d0a00b5f9.patch";
sha256 = "0bzgp9qf53zk4rzk73x5cf2kfqncvlmihcallpplaibpslzalyi4";
})
] ++ (drv.patches or []);
# fix line endings preventing patch from applying
prePatch = ''
${pkgs.dos2unix}/bin/dos2unix hashable.cabal
'' + (drv.prePatch or "");
});
# Too strict bound on random
# https://github.com/haskell-hvr/missingh/issues/56
MissingH = doJailbreak super.MissingH;
# Too strict bound on random
# https://github.com/batterseapower/parallel-io/issues/14
parallel-io = doJailbreak super.parallel-io;
# Disable flaky tests
# https://github.com/DavidEichmann/alpaca-netcode/issues/2
alpaca-netcode = overrideCabal super.alpaca-netcode {
# use testTarget to also pass some flags to the test suite.
# TODO: We should add proper support for this to the builder.
testTarget = "test --test-options='-p \"!/[NOCI]/\"'";
};
# Tests require to run a binary which isn't built
lsp-test = dontCheck super.lsp-test;
# 2021-05-22: Tests fail sometimes (even consistently on hydra)
# when running a fs-related test with >= 12 jobs. To work around
# this, run tests with only a single job.
# https://github.com/vmchale/libarchive/issues/20
libarchive = overrideCabal super.libarchive {
# TODO: We should add proper support for this to the builder.
testTarget = "libarchive-test --test-options='-j1'";
};
# 2021-05-23: Override for a quite recent Hackage release.
taffybar =
if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5"
then throw "Drop src override for taffybar >= 3.2.5"
else overrideCabal super.taffybar (drv: {
src = pkgs.fetchFromGitHub {
owner = "taffybar";
repo = "taffybar";
rev = "91c83e01e131d560e704b12f0d798905e4289a3d";
sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr";
};
version = "3.2.5";
editedCabalFile = null;
});
# 2021-05-25: Fixes darwin build: https://gitlab.com/lysxia/ap-normalize/-/issues/1
ap-normalize =
assert pkgs.lib.versionOlder super.ap-normalize.version "0.1.0.1";
overrideSrc super.ap-normalize rec {
version = "0.1.0.1";
src = pkgs.fetchurl {
url = "https://hackage.haskell.org/package/ap-normalize-${version}/ap-normalize-${version}.tar.gz";
sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2";
};
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -168,4 +168,7 @@ self: super: {
'' + (drv.postPatch or "");
});
# 2021-05-25: Tests fail and I have no way to debug them.
hls-class-plugin = dontCheck super.hls-class-plugin;
}

View file

@ -42,13 +42,10 @@ self: super: {
unix = null;
xhtml = null;
# cabal-install needs more recent versions of Cabal and random, but an older
# version of base16-bytestring.
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});
# cabal-install-parsers is written for Cabal 3.4

View file

@ -60,8 +60,6 @@ self: super: {
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});
# Ignore overly restrictive upper version bounds.

View file

@ -43,13 +43,10 @@ self: super: {
unix = null;
xhtml = null;
# cabal-install needs more recent versions of random, but an older
# version of base16-bytestring.
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = null;
base16-bytestring = self.base16-bytestring_0_1_1_7;
random = dontCheck super.random_1_2_0; # break infinite recursion
hashable = doJailbreak super.hashable; # allow random 1.2.x
});
# Jailbreaks & Version Updates

View file

@ -1,5 +1,6 @@
broken-packages:
# These packages don't compile.
- 3d-graphics-examples
- 3dmodels
- AAI
- abcnotation
@ -33,6 +34,7 @@ broken-packages:
- acme-inator
- acme-kitchen-sink
- acme-left-pad
- acme-memorandom
- acme-miscorder
- acme-mutable-package
- acme-now
@ -42,6 +44,7 @@ broken-packages:
- acme-strfry
- acme-stringly-typed
- acme-this
- acme-zalgo
- acme-zero
- AC-MiniTest
- AC-Terminal
@ -168,7 +171,6 @@ broken-packages:
- archiver
- archlinux
- archnews
- arch-web
- arena
- argon2
- argparser
@ -236,6 +238,7 @@ broken-packages:
- Aurochs
- authenticate-ldap
- authinfo-hs
- auto
- autom
- automata
- autonix-deps
@ -439,6 +442,7 @@ broken-packages:
- BufferedSocket
- buffet
- buffon
- buffon-machines
- bugsnag-haskell
- bugzilla
- build
@ -452,6 +456,7 @@ broken-packages:
- buster
- Buster
- butter
- buttplug-hs-core
- bv-sized
- bytable
- bytearray-parsing
@ -513,6 +518,7 @@ broken-packages:
- cache-polysemy
- caching
- cacophony
- caerbannog
- cafeteria-prelude
- caffegraph
- cairo-core
@ -582,6 +588,7 @@ broken-packages:
- cgen
- cgi-utils
- chalkboard
- chalmers-lava2000
- character-cases
- charter
- chart-histogram
@ -592,6 +599,7 @@ broken-packages:
- Checked
- checkmate
- chell-quickcheck
- chiasma
- Chitra
- choose
- chorale
@ -1251,6 +1259,7 @@ broken-packages:
- exinst-hashable
- exists
- exitcode
- exp-cache
- exp-extended
- explain
- explicit-constraint-lens
@ -1275,6 +1284,7 @@ broken-packages:
- facts
- failable-list
- failure-detector
- fakedata
- fake-type
- faktory
- f-algebra-gen
@ -1344,6 +1354,7 @@ broken-packages:
- fitsio
- fits-parse
- fixed-point
- fixedprec
- fixed-precision
- fixed-storable-array
- fixed-timestep
@ -1475,6 +1486,7 @@ broken-packages:
- fusion
- futun
- future
- fuzzy-time-gen
- fuzzy-timings
- fwgl
- g4ip
@ -1528,6 +1540,7 @@ broken-packages:
- gentlemark
- genvalidity-persistent
- GeocoderOpenCage
- geodetics
- geodetic-types
- geojson-types
- geom2d
@ -1569,6 +1582,7 @@ broken-packages:
- ghc-srcspan-plugin
- ghc-syb
- ghc-syb-utils
- ghc-tags
- ghc-tags-core
- ghc-time-alloc-prof
- ghc-usage
@ -1675,7 +1689,6 @@ broken-packages:
- grasp
- gray-code
- greencard
- greenclip
- greg-client
- gremlin-haskell
- Grempa
@ -1745,7 +1758,6 @@ broken-packages:
- hakismet
- hakka
- hako
- hakyll
- hakyll-shortcode
- HaLeX
- halfs
@ -1766,6 +1778,7 @@ broken-packages:
- hans
- hanspell
- haphviz
- hapistrano
- happindicator
- happindicator3
- happlets
@ -1855,6 +1868,7 @@ broken-packages:
- haskell-rules
- haskellscrabble
- haskellscript
- haskell-snake
- haskell-spacegoo
- haskell-src-exts-prisms
- haskell-src-exts-qq
@ -2049,12 +2063,14 @@ broken-packages:
- hjs
- hjsonpointer
- hjson-query
- hjugement-protocol
- HJVM
- hkd-delta
- hkd-lens
- hkt
- hlbfgsb
- hledger-chart
- hledger-flow
- hledger-irr
- hledger-vty
- hlibBladeRF
@ -2066,6 +2082,9 @@ broken-packages:
- HLogger
- hlongurl
- hls-exactprint-utils
- hls-floskell-plugin
- hls-fourmolu-plugin
- hls-pragmas-plugin
- hlwm
- hmarkup
- hmatrix-banded
@ -2086,6 +2105,7 @@ broken-packages:
- Hmpf
- hmumps
- hnetcdf
- hnn
- hoauth
- hobbes
- hocilib
@ -2230,6 +2250,7 @@ broken-packages:
- hs-pkg-config
- hspread
- hspresent
- hspretty
- hsql
- hs-re
- hsrelp
@ -2398,6 +2419,7 @@ broken-packages:
- ini-qq
- initialize
- inject-function
- inline-asm
- inserts
- instana-haskell-trace-sdk
- instance-map
@ -2775,6 +2797,7 @@ broken-packages:
- L-seed
- lsfrom
- ltext
- ltiv1p1
- ltk
- LTS
- lua-bc
@ -2828,6 +2851,7 @@ broken-packages:
- mappy
- markdown-kate
- marked-pretty
- markov-realization
- mars
- marvin-interpolate
- MASMGen
@ -2878,6 +2902,7 @@ broken-packages:
- memis
- memoization-utils
- memo-ptr
- memorable-bits
- memorypool
- menoh
- menshen
@ -2930,6 +2955,7 @@ broken-packages:
- mit-3qvpPyAi6mH
- mix-arrows
- mixpanel-client
- mltool
- ml-w
- mm2
- mmark
@ -3138,6 +3164,7 @@ broken-packages:
- network-socket-options
- network-transport-amqp
- network-transport-inmemory
- network-transport-tests
- network-uri-json
- network-voicetext
- network-wai-router
@ -3201,6 +3228,7 @@ broken-packages:
- numerals-base
- numeric-qq
- numeric-ranges
- numhask
- numhask-array
- numhask-free
- numhask-prelude
@ -3241,6 +3269,7 @@ broken-packages:
- onama
- ONC-RPC
- on-demand-ssh-tunnel
- one-liner-instances
- oneormore
- onpartitions
- onu-course
@ -3253,6 +3282,7 @@ broken-packages:
- openapi3-code-generator
- openapi-petstore
- openapi-typed
- opencc
- opench-meteo
- OpenCL
- OpenCLRaw
@ -3361,6 +3391,7 @@ broken-packages:
- parcom-lib
- par-dual
- pareto
- parochial
- Parry
- parseargs
- parsec2
@ -3403,6 +3434,7 @@ broken-packages:
- pb-next
- pcd-loader
- pcf-font
- pcgen
- PCLT
- pcre-light-extra
- pdfname
@ -3570,6 +3602,7 @@ broken-packages:
- postgresql-simple-named
- postgresql-simple-sop
- postgresql-simple-url
- postgresql-syntax
- postgresql-typed-lifted
- postgres-tmp
- postgrest-ws
@ -4428,6 +4461,7 @@ broken-packages:
- stripe-hs
- stripe-http-streams
- stripe-signature
- stripe-tests
- strongswan-sql
- structural-traversal
- structures
@ -4490,6 +4524,7 @@ broken-packages:
- syntax-trees
- syntax-trees-fork-bairyn
- synthesizer
- synthesizer-alsa
- Sysmon
- sys-process
- system-canonicalpath
@ -4725,6 +4760,7 @@ broken-packages:
- transformers-lift
- transformers-runnable
- TransformersStepByStep
- transient
- transient-universe
- translatable-intset
- translate
@ -4817,12 +4853,14 @@ broken-packages:
- uhexdump
- uhttpc
- ui-command
- ulid
- unamb-custom
- unbounded-delays-units
- unboxed-containers
- unboxed-references
- unbreak
- unfix-binders
- unfoldable
- unicode-prelude
- unicode-show
- unicode-symbols
@ -4934,6 +4972,7 @@ broken-packages:
- verilog
- verismith
- versioning
- vformat
- vhd
- vhdl
- vicinity
@ -5026,7 +5065,6 @@ broken-packages:
- web-encodings
- WeberLogic
- webfinger-client
- webify
- webkit-javascriptcore
- webmention
- web-output
@ -5127,6 +5165,7 @@ broken-packages:
- xmonad-dbus
- xmonad-eval
- xmonad-vanessa
- xmonad-wallpaper
- xmonad-windownames
- xor
- Xorshift128Plus

View file

@ -77,10 +77,13 @@ default-package-overrides:
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# 2021-05-11: the diagrams libraries still depends on pre 0.6,
# e. g. https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin presumably until base 4.15
# 2021-05-11: not all diagrams libraries have adjusted to
# monoid-extras 0.6 yet, keep them pinned to lower versions
# until we can do a full migration, see
# https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin at most until base 4.15
- monoid-extras < 0.6
- diagrams-core < 1.5.0
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0
@ -111,6 +114,7 @@ extra-packages:
- refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
@ -119,6 +123,9 @@ extra-packages:
package-maintainers:
abbradar:
- Agda
berberman:
- nvfetcher
- arch-web
bdesham:
- pinboard-notes-backup
cdepillabout:
@ -127,6 +134,20 @@ package-maintainers:
- pretty-simple
- spago
- termonad
expipiplus1:
- VulkanMemoryAllocator
- autoapply
- exact-real
- language-c
- orbits
- update-nix-fetchgit
- vector-sized
- vulkan
- vulkan-utils
erictapen:
- hakyll
- hakyll-contrib-hyphenation
- webify
Gabriel439:
- annah
- bench
@ -191,8 +212,10 @@ package-maintainers:
- cabal-fmt
- generic-optics
- ghcup
- ghcide
- haskell-language-server
- hedgehog
- hlint
- hmatrix
- iCalendar
- neuron
@ -306,7 +329,9 @@ unsupported-platforms:
bdcs-api: [ x86_64-darwin ]
bindings-directfb: [ x86_64-darwin ]
bindings-sane: [ x86_64-darwin ]
bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
cut-the-crap: [ x86_64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]

View file

@ -1,4 +1,4 @@
# Stackage Nightly 2021-05-10
# Stackage Nightly 2021-05-19
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -27,6 +27,7 @@ default-package-overrides:
- aeson-pretty ==0.8.8
- aeson-qq ==0.8.3
- aeson-schemas ==1.3.3
- aeson-typescript ==0.3.0.0
- aeson-with ==0.1.2.0
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.0
@ -137,7 +138,7 @@ default-package-overrides:
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.22.0
- amqp-utils ==0.6.1.0
- amqp-utils ==0.6.1.1
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.11
- ansi-wl-pprint ==0.6.9
@ -159,6 +160,7 @@ default-package-overrides:
- arithmoi ==0.11.0.1
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
- ascii ==1.0.1.4
- ascii-case ==1.0.0.4
- ascii-char ==1.0.0.8
@ -194,7 +196,6 @@ default-package-overrides:
- aura ==3.2.4
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- autoexporter ==1.1.20
- auto-update ==0.1.6
- avers ==0.0.17.1
@ -226,8 +227,8 @@ default-package-overrides:
- basic-prelude ==0.7.0
- bazel-runfiles ==0.12
- bbdb ==0.8
- bcp47 ==0.2.0.3
- bcp47-orphans ==0.1.0.3
- bcp47 ==0.2.0.4
- bcp47-orphans ==0.1.0.4
- bcrypt ==0.0.11
- bech32 ==1.1.0
- bech32-th ==1.0.2
@ -301,13 +302,13 @@ default-package-overrides:
- bugsnag-haskell ==0.0.4.1
- bugsnag-hs ==0.2.0.3
- bugzilla-redhat ==0.3.1
- burrito ==1.2.0.1
- burrito ==1.2.0.2
- butcher ==1.3.3.2
- buttplug-hs-core ==0.1.0.0
- bv ==0.5
- bv-little ==1.1.1
- byteable ==0.1.1
- byte-count-reader ==0.10.1.2
- byte-count-reader ==0.10.1.3
- bytedump ==1.0
- byte-order ==0.1.2.0
- byteorder ==1.0.4
@ -356,6 +357,7 @@ default-package-overrides:
- cborg ==0.2.5.0
- cborg-json ==0.2.2.0
- cdar-mBound ==0.1.0.1
- c-enum ==0.1.0.1
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@ -389,9 +391,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
- citeproc ==0.3.0.9
- clash-ghc ==1.2.5
- clash-lib ==1.2.5
- clash-prelude ==1.2.5
- clash-ghc ==1.4.1
- clash-lib ==1.4.1
- clash-prelude ==1.4.1
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- clay ==0.13.3
@ -409,7 +411,7 @@ default-package-overrides:
- cmdargs ==0.10.21
- codec-beam ==0.2.0
- code-page ==0.2.1
- collect-errors ==0.1.1.0
- collect-errors ==0.1.5.0
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- Color ==0.3.1
@ -450,6 +452,7 @@ default-package-overrides:
- concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduino ==0.2.2.0
- conduit ==1.3.4.1
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
@ -461,7 +464,6 @@ default-package-overrides:
- conferer-aeson ==1.1.0.1
- conferer-hspec ==1.1.0.0
- conferer-warp ==1.1.0.0
- ConfigFile ==1.1.4
- config-ini ==0.2.4.0
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
@ -471,6 +473,7 @@ default-package-overrides:
- console-style ==0.0.2.1
- constraint ==0.1.4.0
- constraints ==0.13
- constraints-extras ==0.3.1.0
- constraint-tuples ==0.1.2
- construct ==0.3.0.2
- contravariant ==1.5.3
@ -490,7 +493,7 @@ default-package-overrides:
- cprng-aes ==0.6.1
- cpu ==0.1.2
- cpuinfo ==0.1.0.2
- crackNum ==2.4
- crackNum ==3.1
- crc32c ==0.0.0
- credential-store ==0.1.2
- criterion ==1.5.9.0
@ -498,7 +501,6 @@ default-package-overrides:
- cron ==0.7.0
- crypto-api ==0.13.3
- crypto-cipher-types ==0.0.9
- cryptocompare ==0.1.2
- crypto-enigma ==0.1.1.6
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
@ -571,7 +573,6 @@ default-package-overrides:
- data-textual ==0.3.0.3
- dataurl ==0.1.0.0
- DAV ==1.3.4
- DBFunctor ==0.1.1.1
- dbus ==1.2.17
- dbus-hslogger ==0.1.0.1
- debian ==4.0.2
@ -585,6 +586,9 @@ default-package-overrides:
- deferred-folds ==0.9.17
- dejafu ==2.4.0.2
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
- dependent-sum ==0.7.1.0
- dependent-sum-template ==0.1.0.3
- depq ==0.4.2
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
@ -598,7 +602,7 @@ default-package-overrides:
- dhall-lsp-server ==1.0.14
- dhall-yaml ==1.2.6
- diagrams-solve ==0.1.3
- dialogflow-fulfillment ==0.1.1.3
- dialogflow-fulfillment ==0.1.1.4
- di-core ==1.0.4
- dictionary-sharing ==0.1.0.0
- Diff ==0.4.0
@ -608,7 +612,7 @@ default-package-overrides:
- di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.26
- dirichlet ==0.1.0.2
- dirichlet ==0.1.0.4
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- distributed-closure ==0.4.2.0
@ -646,7 +650,7 @@ default-package-overrides:
- duration ==0.2.0.0
- dvorak ==0.1.0.0
- dynamic-state ==0.3.1
- dyre ==0.8.12
- dyre ==0.9.1
- eap ==0.9.0.2
- earcut ==0.1.0.4
- Earley ==0.13.0.1
@ -682,6 +686,7 @@ default-package-overrides:
- elynx-tools ==0.5.0.2
- elynx-tree ==0.5.0.2
- email-validate ==2.3.2.13
- emd ==0.2.0.0
- emojis ==0.1
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
@ -729,7 +734,7 @@ default-package-overrides:
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
- express ==0.1.8
- express ==0.1.10
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
@ -742,7 +747,7 @@ default-package-overrides:
- fakedata-parser ==0.1.0.0
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- faktory ==1.0.2.1
- faktory ==1.0.2.3
- fast-digits ==0.3.0.0
- fast-logger ==3.0.5
- fast-math ==1.0.2
@ -755,11 +760,10 @@ default-package-overrides:
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fgl ==5.7.0.3
- file-embed ==0.0.13.0
- file-embed ==0.0.14.0
- file-embed-lzma ==0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepath-bytestring ==1.4.2.1.7
- file-path-th ==0.1.0.0
- filepattern ==0.1.2
@ -823,12 +827,13 @@ default-package-overrides:
- funcmp ==1.9
- function-builder ==0.3.0.1
- functor-classes-compat ==1.0.1
- functor-combinators ==0.3.6.0
- fusion-plugin ==0.2.2
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
- fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.0
- fuzzyset ==0.2.1
- fuzzy-time ==0.1.0.0
- gauge ==0.2.5
- gd ==3000.7.3
@ -846,7 +851,7 @@ default-package-overrides:
- generic-monoid ==0.1.0.1
- generic-optics ==2.1.0.0
- GenericPretty ==1.2.2
- generic-random ==1.3.0.1
- generic-random ==1.4.0.0
- generics-eot ==0.4.0.1
- generics-sop ==0.5.1.1
- generics-sop-lens ==0.2.0.1
@ -950,7 +955,7 @@ default-package-overrides:
- graphite ==0.10.0.1
- graphql-client ==1.1.1
- graphs ==0.7.1
- graphula ==2.0.0.4
- graphula ==2.0.0.5
- graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
@ -959,12 +964,12 @@ default-package-overrides:
- greskell-websocket ==0.1.2.5
- groom ==0.1.2.1
- group-by-date ==0.1.0.4
- groups ==0.5.2
- gtk-sni-tray ==0.1.6.0
- groups ==0.5.3
- gtk-sni-tray ==0.1.6.2
- gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1
- H ==0.9.0.1
- hackage-db ==2.1.0
- hackage-db ==2.1.1
- hackage-security ==0.6.0.1
- haddock-library ==1.9.0
- hadoop-streaming ==0.2.0.3
@ -992,8 +997,8 @@ default-package-overrides:
- haskell-gi-overloading ==1.0
- haskell-import-graph ==1.0.4
- haskell-lexer ==1.1
- haskell-lsp ==0.22.0.0
- haskell-lsp-types ==0.22.0.0
- haskell-lsp ==0.24.0.0
- haskell-lsp-types ==0.24.0.0
- haskell-names ==0.9.9
- HaskellNet ==0.6
- haskell-src ==1.0.3.1
@ -1024,7 +1029,7 @@ default-package-overrides:
- hedgehog-fakedata ==0.0.1.4
- hedgehog-fn ==1.0
- hedgehog-quickcheck ==0.1.1
- hedis ==0.14.2
- hedis ==0.14.4
- hedn ==0.3.0.2
- here ==1.2.13
- heredoc ==0.2.0.0
@ -1059,7 +1064,6 @@ default-package-overrides:
- hmpfr ==0.4.4
- hnock ==0.4.0
- hoauth2 ==1.16.0
- hocon ==0.1.0.4
- hOpenPGP ==2.9.5
- hopenpgp-tools ==0.23.6
- hopfli ==0.2.2.1
@ -1104,17 +1108,17 @@ default-package-overrides:
- hspec-core ==2.7.10
- hspec-discover ==2.7.10
- hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.3
- hspec-expectations-json ==1.0.0.4
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.2
- hspec-junit-formatter ==1.0.0.4
- hspec-leancheck ==0.0.4
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
- hspec-need-env ==0.1.0.6
- hspec-need-env ==0.1.0.7
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tables ==0.0.1
@ -1260,7 +1264,7 @@ default-package-overrides:
- io-memoize ==1.1.1.0
- io-region ==0.1.1
- io-storage ==0.3
- io-streams ==1.5.2.0
- io-streams ==1.5.2.1
- io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2
- ipa ==0.3.1
@ -1292,13 +1296,13 @@ default-package-overrides:
- js-dgtable ==0.5.2
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json-feed ==1.0.12
- json-feed ==1.0.13
- jsonpath ==0.2.0.0
- json-rpc ==1.0.3
- json-rpc-generic ==0.2.1.5
- JuicyPixels ==3.3.5
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.4.1
- JuicyPixels-extra ==0.5.0
- JuicyPixels-scale-dct ==0.1.2
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
@ -1324,14 +1328,15 @@ default-package-overrides:
- kubernetes-webhook-haskell ==0.2.0.3
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==1.0.14
- lackey ==1.0.15
- lambdabot-core ==5.3.0.1
- LambdaHack ==0.10.2.0
- lame ==0.2.0
- language-avro ==0.1.3.1
- language-bash ==0.9.2
- language-c ==0.8.3
- language-c-quote ==0.13
- language-docker ==10.0.0
- language-docker ==10.0.1
- language-java ==0.2.9
- language-javascript ==0.7.1.0
- language-protobuf ==1.0.1
@ -1348,6 +1353,7 @@ default-package-overrides:
- lawful ==0.1.0.0
- lazy-csv ==0.5.1
- lazyio ==0.1.0.4
- lazysmallcheck ==0.6
- lca ==0.4
- leancheck ==0.9.4
- leancheck-instances ==0.0.4
@ -1368,6 +1374,7 @@ default-package-overrides:
- lens-regex-pcre ==1.1.0.0
- lenz ==0.4.2.0
- leveldb-haskell ==0.6.5
- libBF ==0.6.2
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
@ -1393,6 +1400,7 @@ default-package-overrides:
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.5
- list-t ==1.0.4
- list-transformer ==1.0.7
- ListTree ==0.2.3
- little-rio ==0.2.2
- llvm-hs ==9.0.1
@ -1413,7 +1421,9 @@ default-package-overrides:
- loop ==0.3.0
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lsp-test ==0.11.0.5
- lsp ==1.2.0.0
- lsp-test ==0.14.0.0
- lsp-types ==1.2.0.0
- lucid ==2.9.12.1
- lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2
@ -1474,7 +1484,7 @@ default-package-overrides:
- microlens-mtl ==0.2.0.1
- microlens-platform ==0.4.2
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.9
- microlens-th ==0.4.3.10
- microspec ==0.2.1.3
- microstache ==1.0.1.2
- midair ==0.2.0.1
@ -1491,8 +1501,7 @@ default-package-overrides:
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.3.0
- mixed-types-num ==0.5.0.3
- mixed-types-num ==0.5.3.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
@ -1500,6 +1509,7 @@ default-package-overrides:
- mmark-ext ==0.2.1.3
- mmorph ==1.1.5
- mnist-idx ==0.1.2.8
- mnist-idx-conduit ==0.4.0.0
- mockery ==0.3.5
- mock-time ==0.1.0
- mod ==0.1.2.2
@ -1632,7 +1642,7 @@ default-package-overrides:
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-prelude ==0.4.3.3
- numhask ==0.6.0.2
- numhask ==0.7.1.0
- NumInstances ==1.4
- numtype-dk ==0.5.0.2
- nuxeo ==0.3.2
@ -1649,7 +1659,6 @@ default-package-overrides:
- old-time ==1.1.0.3
- once ==0.4
- one-liner ==1.0
- one-liner-instances ==0.1.2.1
- OneTuple ==0.2.2.1
- Only ==0.1
- oo-prototypes ==0.1.0.0
@ -1690,12 +1699,11 @@ default-package-overrides:
- pagure-cli ==0.2
- pandoc ==2.13
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-plot ==1.2.0
- pandoc-plot ==1.2.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22
- pantry ==0.5.1.5
- pantry ==0.5.2.1
- parallel ==3.2.2.0
- parallel-io ==0.3.3
- parameterized ==0.5.0.0
- paripari ==0.7.0.0
- parseargs ==0.2.0.9
@ -1712,7 +1720,7 @@ default-package-overrides:
- password ==3.0.0.0
- password-instances ==3.0.0.0
- password-types ==1.0.0.0
- path ==0.7.0
- path ==0.7.1
- path-binary-instance ==0.1.0.1
- path-extensions ==0.1.1.0
- path-extra ==0.2.0
@ -1792,7 +1800,7 @@ default-package-overrides:
- polysemy-plugin ==0.3.0.0
- pooled-io ==0.0.2.2
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- posix-paths ==0.3.0.0
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.4
@ -1830,6 +1838,7 @@ default-package-overrides:
- primitive-extras ==0.10.1
- primitive-unaligned ==0.1.1.1
- primitive-unlifted ==0.1.3.0
- prim-uniq ==0.2
- print-console-colors ==0.1.0.0
- probability ==0.2.7
- process-extras ==0.7.4
@ -1845,7 +1854,7 @@ default-package-overrides:
- promises ==0.3
- prompt ==0.1.1.2
- prospect ==0.1.0.0
- proto3-wire ==1.2.1
- proto3-wire ==1.2.2
- protobuf ==0.2.1.3
- protobuf-simple ==0.1.1.0
- protocol-buffers ==2.4.17
@ -1893,14 +1902,14 @@ default-package-overrides:
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.2
- rampart ==1.1.0.2
- rampart ==1.1.0.3
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.1
- random ==1.2.0
- random-bytestring ==0.1.4
- random-fu ==0.2.7.4
- random-fu ==0.2.7.7
- random-shuffle ==0.0.4
- random-source ==0.3.0.8
- random-source ==0.3.0.11
- random-tree ==0.6.0.5
- range ==0.3.0.2
- ranged-list ==0.1.0.0
@ -1910,7 +1919,7 @@ default-package-overrides:
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- rasterific-svg ==0.3.3.2
- ratel ==1.0.14
- ratel ==1.0.15
- rate-limit ==1.4.2
- ratel-wai ==1.1.5
- rattle ==0.2
@ -1996,7 +2005,8 @@ default-package-overrides:
- rope-utf16-splay ==0.3.2.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.3.2
- rpmbuild-order ==0.4.4
- rp-tree ==0.3.5
- RSA ==2.4.1
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
@ -2018,12 +2028,13 @@ default-package-overrides:
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
- sandwich ==0.1.0.5
- sandwich ==0.1.0.6
- sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4
- sandwich-webdriver ==0.1.0.4
- say ==0.1.0.1
- sbp ==2.6.3
- sbv ==8.14
- scalpel ==0.6.2
- scalpel-core ==0.6.2
- scanf ==0.1.0.0
@ -2161,7 +2172,7 @@ default-package-overrides:
- soap-tls ==0.1.1.4
- socket ==0.8.3.0
- socks ==0.6.1
- some ==1.0.3
- some ==1.0.2
- sop-core ==0.5.0.1
- sort ==1.0.0.0
- sorted-list ==0.2.1.0
@ -2219,6 +2230,7 @@ default-package-overrides:
- store-core ==0.4.4.4
- store-streaming ==0.2.0.3
- stratosphere ==0.59.1
- Stream ==0.4.7.2
- streaming ==0.2.3.0
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.0
@ -2244,7 +2256,6 @@ default-package-overrides:
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
- stripe-tests ==2.6.2
- strive ==5.0.14
- structs ==0.1.6
- structured ==0.1.0.1
@ -2275,7 +2286,6 @@ default-package-overrides:
- system-filepath ==0.4.14
- system-info ==0.5.2
- tabular ==0.2.2.8
- taffybar ==3.2.3
- tagchup ==0.4.1.1
- tagged ==0.8.6.1
- tagged-binary ==0.2.0.1
@ -2300,6 +2310,7 @@ default-package-overrides:
- tasty-hspec ==1.1.6
- tasty-hunit ==0.10.0.3
- tasty-hunit-compat ==0.2.0.1
- tasty-inspection-testing ==0.1
- tasty-kat ==0.0.3
- tasty-leancheck ==0.0.1
- tasty-lua ==0.2.3.2
@ -2375,7 +2386,7 @@ default-package-overrides:
- thread-local-storage ==0.2
- threads ==0.5.1.6
- thread-supervisor ==0.2.0.0
- threepenny-gui ==0.9.0.0
- threepenny-gui ==0.9.1.0
- th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.9
- throttle-io-stream ==0.2.0.1
@ -2426,6 +2437,7 @@ default-package-overrides:
- tree-view ==0.5.1
- trifecta ==2.1.1
- triplesec ==0.2.2.1
- trivial-constraint ==0.7.0.0
- tsv2csv ==0.1.0.2
- ttc ==0.4.0.0
- ttl-hashtables ==1.4.1.0
@ -2438,7 +2450,7 @@ default-package-overrides:
- typecheck-plugin-nat-simple ==0.1.0.2
- TypeCompose ==0.9.14
- typed-process ==0.2.6.0
- typed-uuid ==0.0.0.2
- typed-uuid ==0.1.0.0
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.1
@ -2447,6 +2459,7 @@ default-package-overrides:
- type-level-kv-list ==1.1.0
- type-level-natural-number ==2.0
- type-level-numbers ==0.1.1.1
- typelits-witnesses ==0.4.0.0
- type-map ==0.1.6.0
- type-natural ==1.1.0.0
- typenums ==0.1.4
@ -2458,7 +2471,6 @@ default-package-overrides:
- tzdata ==0.2.20201021.0
- ua-parser ==0.7.6.0
- uglymemo ==0.1.0.1
- ulid ==0.3.0.0
- unagi-chan ==0.4.1.3
- unbounded-delays ==0.1.1.1
- unboxed-ref ==0.4.0.0
@ -2483,6 +2495,7 @@ default-package-overrides:
- unit-constraint ==0.0.0
- universe ==1.2.1
- universe-base ==1.1.2
- universe-dependent-sum ==1.3
- universe-instances-base ==1.1
- universe-instances-extended ==1.1.2
- universe-instances-trans ==1.1
@ -2492,7 +2505,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.15
- unliftio ==0.2.16
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2550,7 +2563,7 @@ default-package-overrides:
- vformat-aeson ==0.1.0.1
- vformat-time ==0.1.0.0
- ViennaRNAParser ==1.3.3
- vinyl ==0.13.1
- vinyl ==0.13.2
- void ==0.7.3
- vty ==5.33
- wai ==3.2.3
@ -2571,7 +2584,7 @@ default-package-overrides:
- wai-rate-limit-redis ==0.1.0.0
- wai-saml2 ==0.2.1.2
- wai-session ==0.3.3
- wai-session-redis ==0.1.0.1
- wai-session-redis ==0.1.0.2
- wai-slack-middleware ==0.2.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
@ -2597,7 +2610,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.2.1.1
- witch ==0.3.1.0
- witherable ==0.4.1
- within ==0.2.0.1
- with-location ==0.1.0
@ -2627,7 +2640,6 @@ default-package-overrides:
- x509-validation ==1.6.11
- Xauth ==0.1
- xdg-basedir ==0.2.2
- xdg-desktop-entry ==0.1.1.1
- xdg-userdirs ==0.1.0.2
- xeno ==0.4.2
- xlsx ==0.8.3
@ -2656,15 +2668,15 @@ default-package-overrides:
- yesod ==1.6.1.1
- yesod-auth ==1.6.10.3
- yesod-auth-hashdb ==1.7.1.6
- yesod-auth-oauth2 ==0.6.3.0
- yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1
- yesod-core ==1.6.19.0
- yesod-core ==1.6.20
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.9
- yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.6
- yesod-page-cursor ==2.0.0.7
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0

View file

@ -399,9 +399,9 @@ dont-distribute-packages:
- claferwiki
- clash
- clash-ghc
- clash-ghc_1_4_1
- clash-ghc_1_4_2
- clash-lib
- clash-lib_1_4_1
- clash-lib_1_4_2
- clash-multisignal
- clash-prelude-quickcheck
- clash-systemverilog
@ -546,6 +546,7 @@ dont-distribute-packages:
- ctpl
- cube
- cursedcsv
- cursor-fuzzy-time-gen
- cv-combinators
- cypher
- Dangerous
@ -785,6 +786,7 @@ dont-distribute-packages:
- factual-api
- fadno-braids
- FailureT
- fakedata-quickcheck
- fallingblocks
- falling-turnip
- family-tree
@ -1234,6 +1236,7 @@ dont-distribute-packages:
- hasql-postgres
- hasql-postgres-options
- hasql-queue
- hasql-th
- hastache-aeson
- haste-app
- haste-gapi
@ -1276,6 +1279,7 @@ dont-distribute-packages:
- heavy-log-shortcuts
- hecc
- hedgehog-checkers-lens
- hedgehog-fakedata
- hedgehog-gen-json
- Hedi
- hedis-pile
@ -2093,6 +2097,7 @@ dont-distribute-packages:
- network-topic-models
- network-websocket
- newsletter-mailgun
- newsynth
- ngrams-loader
- ngx-export-tools-extra
- nikepub
@ -2242,6 +2247,7 @@ dont-distribute-packages:
- pkgtreediff
- planet-mitchell
- plocketed
- ploterific
- Plot-ho-matic
- PlslTools
- png-file
@ -2354,6 +2360,7 @@ dont-distribute-packages:
- questioner
- queuelike
- quickbench
- quickcheck-combinators
- quickcheck-poly
- quickcheck-regex
- quickcheck-relaxng
@ -2842,6 +2849,8 @@ dont-distribute-packages:
- strelka
- strict-data
- string-typelits
- stripe-haskell
- stripe-http-client
- stripe-scotty
- structural-induction
- structured-mongoDB
@ -3046,6 +3055,7 @@ dont-distribute-packages:
- UMM
- unagi-bloomfilter
- unbound
- unfoldable-restricted
- unicode-normalization
- uni-events
- uniformBase
@ -3109,6 +3119,8 @@ dont-distribute-packages:
- verdict-json
- versioning-servant
- vflow-types
- vformat-aeson
- vformat-time
- vfr-waypoints
- ViennaRNA-extras
- vigilance

View file

@ -196,6 +196,7 @@ self: super: builtins.intersectAttrs super {
tcp-streams = dontCheck super.tcp-streams;
holy-project = dontCheck super.holy-project;
mustache = dontCheck super.mustache;
arch-web = dontCheck super.arch-web;
# Tries to mess with extended POSIX attributes, but can't in our chroot environment.
xattr = dontCheck super.xattr;
@ -259,8 +260,18 @@ self: super: builtins.intersectAttrs super {
'';
}));
# Patch to consider NIX_GHC just like xmonad does
dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
dyre =
appendPatch
# dyre's tests appear to be trying to directly call GHC.
(dontCheck super.dyre)
# Dyre needs special support for reading the NIX_GHC env var. This is
# available upstream in https://github.com/willdonnelly/dyre/pull/43, but
# hasn't been released to Hackage as of dyre-0.9.1. Likely included in
# next version.
(pkgs.fetchpatch {
url = "https://github.com/willdonnelly/dyre/commit/c7f29d321aae343d6b314f058812dffcba9d7133.patch";
sha256 = "10m22k35bi6cci798vjpy4c2l08lq5nmmj24iwp0aflvmjdgscdb";
});
# https://github.com/edwinb/EpiVM/issues/13
# https://github.com/edwinb/EpiVM/issues/14
@ -803,4 +814,9 @@ self: super: builtins.intersectAttrs super {
hw-prim-bits = overrideCabal super.hw-prim-bits {
platforms = pkgs.lib.platforms.x86;
};
# random 1.2.0 has tests that indirectly depend on
# itself causing an infinite recursion at evaluation
# time
random = dontCheck super.random;
}

View file

@ -72,7 +72,7 @@ in
, shellHook ? ""
, coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false
, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
, hardeningDisable ? null
, enableSeparateBinOutput ? false
, enableSeparateDataOutput ? false
, enableSeparateDocOutput ? doHaddock
@ -417,6 +417,17 @@ stdenv.mkDerivation ({
configurePlatforms = [];
inherit configureFlags;
# Note: the options here must be always added, regardless of whether the
# package specifies `hardeningDisable`.
hardeningDisable = lib.optionals (args ? hardeningDisable) hardeningDisable
++ lib.optional (ghc.isHaLVM or false) "all"
# Static libraries (ie. all of pkgsStatic.haskellPackages) fail to build
# because by default Nix adds `-pie` to the linker flags: this
# conflicts with the `-r` and `-no-pie` flags added by GHC (see
# https://gitlab.haskell.org/ghc/ghc/-/issues/19580). hardeningDisable
# changes the default Nix behavior regarding adding "hardening" flags.
++ lib.optional enableStaticLibraries "pie";
configurePhase = ''
runHook preConfigure
@ -674,7 +685,6 @@ stdenv.mkDerivation ({
// optionalAttrs (args ? preFixup) { inherit preFixup; }
// optionalAttrs (args ? postFixup) { inherit postFixup; }
// optionalAttrs (args ? dontStrip) { inherit dontStrip; }
// optionalAttrs (args ? hardeningDisable) { inherit hardeningDisable; }
// optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
)
)

File diff suppressed because it is too large Load diff

View file

@ -1,25 +0,0 @@
--- dyre-0.8.12/Config/Dyre/Compile.hs 2015-04-13 11:00:20.794278350 +0100
+++ dyre-0.8.12-patched/Config/Dyre/Compile.hs 2015-04-13 11:07:26.938893502 +0100
@@ -10,11 +10,13 @@
import System.FilePath ( (</>) )
import System.Directory ( getCurrentDirectory, doesFileExist
, createDirectoryIfMissing )
+import System.Environment ( lookupEnv )
+import Control.Applicative ((<$>))
import Control.Exception ( bracket )
-import GHC.Paths ( ghc )
import Config.Dyre.Paths ( getPaths )
import Config.Dyre.Params ( Params(..) )
+import Data.Maybe ( fromMaybe )
-- | Return the path to the error file.
getErrorPath :: Params cfgType -> IO FilePath
@@ -47,6 +49,7 @@
errFile <- getErrorPath params
result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do
ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir
+ ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC"
ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing
Nothing Nothing (Just errHandle)
waitForProcess ghcProc

View file

@ -0,0 +1,14 @@
{ buildDunePackage, junit, alcotest }:
buildDunePackage ({
pname = "junit_alcotest";
inherit (junit) src version meta useDune2;
propagatedBuildInputs = [
junit
alcotest
];
doCheck = false; # 2 tests fail: 1) "Test with unexpected exception"; 2) "with wrong result";
})

View file

@ -0,0 +1,26 @@
{ lib, fetchurl, buildDunePackage, ptime, tyxml }:
buildDunePackage (rec {
pname = "junit";
version = "2.0.2";
src = fetchurl {
url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz";
sha256 = "00bbx5j8vsy9fqbc04xa3lsalaxicirmbczr65bllfk1afv43agx";
};
propagatedBuildInputs = [
ptime
tyxml
];
useDune2 = true;
doCheck = true;
meta = with lib; {
description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest.";
license = licenses.gpl3;
maintainers = with maintainers; [ superherointj ];
homepage = "https://github.com/Khady/ocaml-junit";
};
})

View file

@ -0,0 +1,14 @@
{ buildDunePackage, junit, ounit }:
buildDunePackage ({
pname = "junit_ounit";
inherit (junit) src version meta useDune2;
propagatedBuildInputs = [
junit
ounit
];
doCheck = true;
})

View file

@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "ansible-core";
version = "2.11.0";
version = "2.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l";
sha256 = "sha256-fnWCepTUfRw+GTDXCPDvY3o6uaIfdXqvVd6rbp9HxoI=";
};
# ansible_connection is already wrapped, so don't pass it through

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "hwi";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
sha256 = "148m0vgwm6l8drcx6j3fjs2zpdzvslk4w2nkb8nm0g8qdlm6gjlw";
sha256 = "sha256-s0pKYqesZjHE6YndqsMwCuqLK7eE82oRiSXxBdUtEX4=";
};
propagatedBuildInputs = [

View file

@ -1,8 +1,9 @@
{ fetchFromGitHub
, cargo
, ctags
, lib
, makeWrapper
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
@ -18,6 +19,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1pz5hvn1iq26i8c2cmqavhnri8h0sn40khrxvcdkj9q47nsj5wcx";
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
# `ctags` must be accessible in `PATH` for `ptags` to work.
wrapProgram "$out/bin/ptags" \
--prefix PATH : "${lib.makeBinPath [ ctags ]}"
'';
# Sanity check.
checkPhase = ''
$releaseDir/ptags --help > /dev/null

View file

@ -6,10 +6,10 @@ let
pname = "MacOSX-SDK";
version = "11.0.0";
# https://swscan.apple.com/content/catalogs/others/index-10.16.merged-1.sucatalog
# https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
src = fetchurl {
url = "http://swcdn.apple.com/content/downloads/58/37/001-75138-A_59RXKDS8YM/12ksm19hgzscfc7cau3yhecz4vpkps7wbq/CLTools_macOSNMOS_SDK.pkg";
sha256 = "0n51ba926ckwm62w5c8lk3w5hj4ihk0p5j02321qi75wh824hl8m";
url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg";
sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf";
};
dontBuild = true;
@ -24,7 +24,7 @@ let
'';
installPhase = ''
cd Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
mkdir $out
cp -r System usr $out/

View file

@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
description = "A recursive DNS server";
homepage = "https://www.powerdns.com/";
platforms = platforms.linux;
badPlatforms = [
"i686-linux" # a 64-bit time_t is needed
];
license = licenses.gpl2;
maintainers = with maintainers; [ rnhmjoj ];
};

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
version = "0.11.4";
version = "0.11.8";
src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng=";
sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs=";
};
cargoSha256 = "sha256-JTjkMXwLLh/kjqAFmi2c59F8POAqn5t/kTJfJkR2BL4=";
cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -0,0 +1,46 @@
{ lib, stdenv, fetchurl
, cmake, perl, go
, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2
}:
stdenv.mkDerivation rec {
pname = "android-tools";
version = "31.0.0p1";
src = fetchurl {
url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz";
sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i";
};
nativeBuildInputs = [ cmake perl go ];
buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ];
# Don't try to fetch any Go modules via the network:
GOFLAGS = [ "-mod=vendor" ];
preConfigure = ''
export GOCACHE=$TMPDIR/go-cache
'';
meta = with lib; {
description = "Android SDK platform tools";
longDescription = ''
Android SDK Platform-Tools is a component for the Android SDK. It
includes tools that interface with the Android platform, such as adb and
fastboot. These tools are required for Android app development. They're
also needed if you want to unlock your device bootloader and flash it
with a new system image.
Currently the following tools are supported:
- adb
- fastboot
- mke2fs.android (required by fastboot)
- simg2img, img2simg, append2simg
'';
# https://developer.android.com/studio/command-line#tools-platform
# https://developer.android.com/studio/releases/platform-tools
homepage = "https://github.com/nmeum/android-tools";
license = with licenses; [ asl20 unicode-dfs-2015 ];
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "02cam5gkhnlwhb9aqcqmkl8kskgikih0bmyx09ybi3gpaf4z82f7";
sha256 = "sha256-+hEgag5H7PaBwZSBp3D17q3TZRO2SVBe5M1Ep/jeg1w=";
};
installPhase = ''

View file

@ -4,6 +4,7 @@
, python3Packages
, gnupg
, pass
, makeWrapper
}:
python3Packages.buildPythonApplication rec {
@ -55,6 +56,16 @@ python3Packages.buildPythonApplication rec {
$out/bin/pimport --list-exporters --list-importers
'';
postInstall = ''
mkdir -p $out/lib/password-store/extensions
cp ${src}/scripts/import.bash $out/lib/password-store/extensions/import.bash
wrapProgram $out/lib/password-store/extensions/import.bash \
--prefix PATH : "${python3Packages.python.withPackages(_: propagatedBuildInputs)}/bin" \
--prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}" \
--run "export PREFIX"
cp -r ${src}/share $out/
'';
meta = with lib; {
description = "Pass extension for importing data from existing password managers";
homepage = "https://github.com/roddhjav/pass-import";

View file

@ -1039,6 +1039,10 @@ in
analog = callPackage ../tools/admin/analog {};
android-tools = lowPrio (callPackage ../tools/misc/android-tools {
stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv;
});
angle-grinder = callPackage ../tools/text/angle-grinder {};
ansifilter = callPackage ../tools/text/ansifilter {};
@ -7170,6 +7174,14 @@ in
nvchecker = with python3Packages; toPythonApplication nvchecker;
nvfetcher = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.nvfetcher) (drv: {
executableToolDepends = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/nvfetcher \
--prefix PATH ":" "${nvchecker}/bin:${nix-prefetch-git}/bin"
'';
});
miller = callPackage ../tools/text/miller { };
milu = callPackage ../applications/misc/milu { };

View file

@ -543,6 +543,10 @@ let
jsonm = callPackage ../development/ocaml-modules/jsonm { };
junit = callPackage ../development/ocaml-modules/junit { };
junit_ounit = callPackage ../development/ocaml-modules/junit/ounit.nix { };
junit_alcotest = callPackage ../development/ocaml-modules/junit/alcotest.nix { };
jwto = callPackage ../development/ocaml-modules/jwto { };
kafka = callPackage ../development/ocaml-modules/kafka { };

View file

@ -81,6 +81,9 @@ let
recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {};
staticHaskellPackagesPlatforms =
packagePlatforms pkgs.pkgsStatic.haskellPackages;
jobs = recursiveUpdateMany [
(mapTestOn {
haskellPackages = packagePlatforms pkgs.haskellPackages;
@ -93,6 +96,16 @@ let
writers = testPlatforms.writers;
};
# test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC
pkgsStatic.haskellPackages = {
inherit (staticHaskellPackagesPlatforms)
hello
random
lens
;
};
# top-level packages that depend on haskellPackages
inherit (pkgsPlatforms)
agda
@ -273,6 +286,25 @@ let
(name: jobs.haskellPackages."${name}")
(maintainedPkgNames pkgs.haskellPackages));
};
staticHaskellPackages = pkgs.releaseTools.aggregate {
name = "static-haskell-packages";
meta = {
description = "Static haskell builds using the pkgsStatic infrastructure";
maintainers = [
lib.maintainers.sternenseemann
lib.maintainers.rnhmjoj
];
};
constituents = [
# TODO: reenable darwin builds if static libiconv works
jobs.pkgsStatic.haskellPackages.hello.x86_64-linux
jobs.pkgsStatic.haskellPackages.hello.aarch64-linux
jobs.pkgsStatic.haskellPackages.lens.x86_64-linux
jobs.pkgsStatic.haskellPackages.lens.aarch64-linux
jobs.pkgsStatic.haskellPackages.random.x86_64-linux
jobs.pkgsStatic.haskellPackages.random.aarch64-linux
];
};
}
];