JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-06 18:30:36 +00:00 committed by GitHub
commit a1f68141f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 2002 additions and 1272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/functions.xml
View File

@ -10,5 +10,5 @@
<xi:include href="functions/generators.xml" />
<xi:include href="functions/debug.xml" />
<xi:include href="functions/prefer-remote-fetch.xml" />
<xi:include href="functions/nix-gitignore.xml" />
<xi:include href="functions/nix-gitignore.section.xml" />
</chapter>

49
doc/functions/nix-gitignore.section.md Normal file
View File

@ -0,0 +1,49 @@
# pkgs.nix-gitignore {#sec-pkgs-nix-gitignore}
`pkgs.nix-gitignore` is a function that acts similarly to `builtins.filterSource` but also allows filtering with the help of the gitignore format.
## Usage {#sec-pkgs-nix-gitignore-usage}
`pkgs.nix-gitignore` exports a number of functions, but you\'ll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string.
```nix
{ pkgs ? import <nixpkgs> {} }:
nix-gitignore.gitignoreSource [] ./source
# Simplest version
nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source
# This one reads the ./source/.gitignore and concats the auxiliary ignores
nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source
# Use this string as gitignore, don't read ./source/.gitignore.
nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source
# It also accepts a list (of strings and paths) that will be concatenated
# once the paths are turned to strings via readFile.
```
These functions are derived from the `Filter` functions by setting the first filter argument to `(_: _: true)`:
```nix
gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
gitignoreSource = gitignoreFilterSource (_: _: true);
```
Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it\'s blacklisted by either your filter or the gitignoreFilter.
If you want to make your own filter from scratch, you may use
```nix
gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
```
## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive}
If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
```nix
gitignoreFilterRecursiveSource = filter: patterns: root:
# OR
gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
```

70
doc/functions/nix-gitignore.xml
View File

@ -1,70 +0,0 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="sec-pkgs-nix-gitignore">
<title>pkgs.nix-gitignore</title>
<para>
<function>pkgs.nix-gitignore</function> is a function that acts similarly to <literal>builtins.filterSource</literal> but also allows filtering with the help of the gitignore format.
</para>
<section xml:id="sec-pkgs-nix-gitignore-usage">
<title>Usage</title>
<para>
<literal>pkgs.nix-gitignore</literal> exports a number of functions, but you'll most likely need either <literal>gitignoreSource</literal> or <literal>gitignoreSourcePure</literal>. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string.
</para>
<programlisting><![CDATA[
{ pkgs ? import <nixpkgs> {} }:
nix-gitignore.gitignoreSource [] ./source
# Simplest version
nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source
# This one reads the ./source/.gitignore and concats the auxiliary ignores
nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source
# Use this string as gitignore, don't read ./source/.gitignore.
nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source
# It also accepts a list (of strings and paths) that will be concatenated
# once the paths are turned to strings via readFile.
]]></programlisting>
<para>
These functions are derived from the <literal>Filter</literal> functions by setting the first filter argument to <literal>(_: _: true)</literal>:
</para>
<programlisting><![CDATA[
gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true);
gitignoreSource = gitignoreFilterSource (_: _: true);
]]></programlisting>
<para>
Those filter functions accept the same arguments the <literal>builtins.filterSource</literal> function would pass to its filters, thus <literal>fn: gitignoreFilterSourcePure fn ""</literal> should be extensionally equivalent to <literal>filterSource</literal>. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter.
</para>
<para>
If you want to make your own filter from scratch, you may use
</para>
<programlisting><![CDATA[
gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root;
]]></programlisting>
</section>
<section xml:id="sec-pkgs-nix-gitignore-usage-recursive">
<title>gitignore files in subdirectories</title>
<para>
If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function:
</para>
<programlisting><![CDATA[
gitignoreFilterRecursiveSource = filter: patterns: root:
# OR
gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true);
]]></programlisting>
</section>
</section>

4
maintainers/scripts/haskell/regenerate-hackage-packages.sh
View File

@ -14,6 +14,8 @@
set -euo pipefail
HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}"
# To prevent hackage2nix fails because of encoding.
# See: https://github.com/NixOS/nixpkgs/pull/122023
export LC_ALL=C.UTF-8
@ -23,7 +25,7 @@ unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"
config_dir=pkgs/development/haskell-modules/configuration-hackage2nix
echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..."
hackage2nix \
"$HACKAGE2NIX" \
--hackage "$unpacked_hackage" \
--preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \
--nixpkgs "$PWD" \

1
maintainers/team-list.nix
View File

@ -155,7 +155,6 @@ with lib.maintainers; {
matrix = {
members = [
ma27
pacien
fadenb
mguentner
ekleog

2
nixos/modules/security/acme.xml
View File

@ -194,7 +194,7 @@ services.httpd = {
<para>
This is useful if you want to generate a wildcard certificate, since
ACME servers will only hand out wildcard certs over DNS validation.
There a number of supported DNS providers and servers you can utilise,
There are a number of supported DNS providers and servers you can utilise,
see the <link xlink:href="https://go-acme.github.io/lego/dns/">lego docs</link>
for provider/server specific configuration values. For the sake of these
docs, we will provide a fully self-hosted example using bind.

3
nixos/tests/acme.nix
View File

@ -392,14 +392,11 @@ in import ./make-test-python.nix ({ lib, ... }: {
# Check the key hash before and after adding an alias. It should not change.
# The previous test reverts the ed384 change
webserver.wait_for_unit("acme-finished-a.example.test.target")
keyhash_old = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem")
switch_to(webserver, "nginx-aliases")
webserver.wait_for_unit("acme-finished-a.example.test.target")
check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test")
check_connection(client, "b.example.test")
keyhash_new = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem")
assert keyhash_old == keyhash_new
with subtest("Can request certificates for vhost + aliases (apache-httpd)"):
try:

6
pkgs/applications/networking/mailreaders/himalaya/default.nix
View File

@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wiasnkoIU4l1yyhUSTahOJMCOyhpz2w4WJzi/UBmiHE=";
sha256 = "sha256-6RgT/SxO4vsk8Yx2AbaNIFvnAvgDmeTXvb/v6nUJxhc=";
};
cargoSha256 = "sha256-VXSJLDpT0s+sh6buOP63QSiUp34H6G/FWibemtNU9wQ=";
cargoSha256 = "sha256-NEuIh7FwIdAWzlChna3+G0VukfV8nYZfVWa+3LxQCIA=";
# use --lib flag to avoid test with imap server
# https://github.com/soywod/himalaya/issues/145

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"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"
"commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz",
"sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k",
"msg": "Update from Hackage at 2021-06-02T14:32:36Z"
}

4
pkgs/data/themes/adwaita-qt/default.nix
View File

@ -12,13 +12,13 @@
mkDerivation rec {
pname = "adwaita-qt";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = pname;
rev = version;
sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9";
sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg=";
};
nativeBuildInputs = [

80
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -203,12 +203,11 @@ self: super: {
sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d";
revert = true;
})
# fix broken location annotations (necessary for update-nix-fetchgit).
# Can be removed on the next hnix release after
# https://github.com/haskell-nix/hnix/pull/936 is merged.
# allow relude < 1.0 again
(pkgs.fetchpatch {
url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch";
sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6";
url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch";
sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86";
revert = true;
})
] ++ (drv.patches or []);
# make sure patches are not broken by cabal file revisions
@ -704,6 +703,9 @@ self: super: {
# 2021-03-12: All of this libraries have to restrictive upper bounds
# https://github.com/diagrams/diagrams-core/issues/112
# https://github.com/diagrams/diagrams-cairo/issues/77
# https://github.com/diagrams/diagrams-rasterific/issues/63
# https://github.com/diagrams/diagrams-cairo/issues/77
active = doJailbreak super.active;
statestack = doJailbreak super.statestack;
force-layout = doJailbreak super.force-layout;
@ -713,13 +715,20 @@ self: super: {
diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib;
# apply patch from master to add compat with optparse-applicative >= 0.16
# Apply patch from master to add compat with optparse-applicative >= 0.16.
# We unfortunately can't upgrade to 1.4.4 which includes this patch yet
# since it would require monoid-extras 0.6 which breaks other diagrams libs.
diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
(pkgs.fetchpatch {
url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ];
}));
diagrams-rasterific = doJailbreak super.diagrams-rasterific;
diagrams-cairo = doJailbreak super.diagrams-cairo;
# https://github.com/diagrams/diagrams-solve/issues/4
diagrams-solve = dontCheck super.diagrams-solve;
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
@ -737,9 +746,6 @@ self: super: {
# Has a dependency on outdated versions of directory.
cautious-file = doJailbreak (dontCheck super.cautious-file);
# https://github.com/diagrams/diagrams-solve/issues/4
diagrams-solve = dontCheck super.diagrams-solve;
# test suite does not compile with recent versions of QuickCheck
integer-logarithms = dontCheck (super.integer-logarithms);
@ -1305,10 +1311,6 @@ self: super: {
gi-gdkx11 = self.gi-gdkx11_3_0_11;
gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10;
# 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
# 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;
@ -1398,22 +1400,6 @@ self: super: {
pkgs.lib.makeBinPath deps
}"
'';
# These can both be removed upon the release of update-nix-fetchgit-0.2.7
patches = [
# 2021-05-17 compile with hnix >= 0.13
# https://github.com/expipiplus1/update-nix-fetchgit/pull/64
(pkgs.fetchpatch {
url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch";
sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg";
})
# Fix test failure
# https://github.com/expipiplus1/update-nix-fetchgit/pull/60
(pkgs.fetchpatch {
url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch";
sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9";
})
] ++ (drv.patches or []);
}));
# Our quickcheck-instances is too old for the newer binary-instances, but
@ -1821,10 +1807,6 @@ self: super: {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
};
# Too strict version bounds on base and optparse-applicative
# https://github.com/diagrams/diagrams-cairo/issues/77
diagrams-cairo = doJailbreak super.diagrams-cairo;
# Too strict version bounds on base
# https://github.com/gibiansky/IHaskell/issues/1217
ihaskell-display = doJailbreak super.ihaskell-display;
@ -1943,8 +1925,8 @@ EOT
# 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
# Too strict bound on containers
# https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933
parallel-io = doJailbreak super.parallel-io;
# Disable flaky tests
@ -1967,30 +1949,8 @@ EOT
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";
};
};
# unrestrict bounds for hashable and semigroups
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

2
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -5,7 +5,7 @@ with haskellLib;
self: super: {
# This compiler version needs llvm 9.x.
llvmPackages = pkgs.llvmPackages_9;
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_9;
# Disable GHC 8.10.x core libraries.
array = null;

2
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -5,7 +5,7 @@ with haskellLib;
self: super: {
# This compiler version needs llvm 6.x.
llvmPackages = pkgs.llvmPackages_6;
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_6;
# Disable GHC 8.6.x core libraries.
array = null;

2
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -5,7 +5,7 @@ with haskellLib;
self: super: {
# This compiler version needs llvm 7.x.
llvmPackages = pkgs.llvmPackages_7;
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_7;
# Disable GHC 8.8.x core libraries.
array = null;

2
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -5,7 +5,7 @@ with haskellLib;
self: super: {
# This compiler version needs llvm 10.x.
llvmPackages = pkgs.llvmPackages_10;
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
# Disable GHC 9.0.x core libraries.
array = null;

2
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -11,7 +11,7 @@ with haskellLib;
self: super: {
llvmPackages = pkgs.llvmPackages_10;
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
# Disable GHC 8.7.x core libraries.
array = null;

40
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -703,6 +703,7 @@ broken-packages:
- commander
- Commando
- commodities
- commonmark-cli
- commsec
- compactable
- Compactable
@ -1000,12 +1001,12 @@ broken-packages:
- dhrun
- dia-base
- diagrams-boolean
- diagrams-builder
- diagrams-canvas
- diagrams-graphviz
- diagrams-gtk
- diagrams-pdf
- diagrams-qrcode
- diagrams-rasterific
- diagrams-tikz
- dib
- dice2tex
@ -1039,6 +1040,7 @@ broken-packages:
- direct-plugins
- direct-rocksdb
- direm
- discord-haskell
- discordian-calendar
- discord-types
- discrete
@ -1282,6 +1284,7 @@ broken-packages:
- Facebook-Password-Hacker-Online-Latest-Version
- faceted
- facts
- fadno-braids
- failable-list
- failure-detector
- fakedata
@ -1635,6 +1638,7 @@ broken-packages:
- global-variables
- glob-posix
- GlomeTrace
- gloss-banana
- gloss-export
- gloss-game
- glpk-headers
@ -1758,7 +1762,18 @@ broken-packages:
- hakismet
- hakka
- hako
- hakyll-blaze-templates
- hakyll-contrib
- hakyll-contrib-csv
- hakyll-contrib-elm
- hakyll-contrib-links
- hakyll-dhall
- hakyll-dir-list
- hakyll-process
- hakyll-R
- hakyll-series
- hakyll-shortcode
- hakyll-shortcut-links
- HaLeX
- halfs
- halipeto
@ -1832,7 +1847,6 @@ broken-packages:
- haskell-awk
- haskell-bitmex-rest
- haskell-brainfuck
- haskell-ci
- haskell-cnc
- haskell-coffee
- haskell-compression
@ -1886,6 +1900,7 @@ broken-packages:
- haskey
- haskheap
- haskhol-core
- hasklepias
- haskmon
- haskoin
- haskoin-util
@ -1897,6 +1912,7 @@ broken-packages:
- haskus-binary
- haskyapi
- hasmin
- hasqlator-mysql
- hasql-backend
- hasql-class
- hasql-cursor-transaction
@ -2081,6 +2097,7 @@ broken-packages:
- hlogger
- HLogger
- hlongurl
- hlrdb-core
- hls-exactprint-utils
- hls-floskell-plugin
- hls-fourmolu-plugin
@ -2092,6 +2109,7 @@ broken-packages:
- hmatrix-nipals
- hmatrix-sparse
- hmatrix-static
- hmatrix-sundials
- hmatrix-svdlibc
- hmatrix-syntax
- hmatrix-tests
@ -2557,6 +2575,7 @@ broken-packages:
- katip-syslog
- katt
- katydid
- kawaii
- kawhi
- kdesrc-build-extra
- kd-tree
@ -2857,6 +2876,7 @@ broken-packages:
- MASMGen
- massiv-persist
- massiv-serialise
- master-plan
- mathflow
- math-grads
- math-interpolate
@ -3407,6 +3427,7 @@ broken-packages:
- parser-helper
- parsers-megaparsec
- parsimony
- parsley
- parsnip
- partage
- partial-records
@ -3467,6 +3488,7 @@ broken-packages:
- persistent-cereal
- persistent-database-url
- persistent-discover
- persistent-documentation
- persistent-equivalence
- persistent-migration
- persistent-mongoDB
@ -3612,6 +3634,7 @@ broken-packages:
- postmaster
- potato-tool
- potoki-core
- powerdns
- powermate
- powerpc
- powerqueue-levelmem
@ -3719,6 +3742,7 @@ broken-packages:
- pushme
- push-notifications
- putlenses
- puzzle-draw
- pyffi
- pyfi
- python-pickle
@ -3763,6 +3787,7 @@ broken-packages:
- quiver
- quokka
- quoridor-hs
- raaz
- RabbitMQ
- rad
- radian
@ -3800,7 +3825,9 @@ broken-packages:
- react-haskell
- reaction-logic
- reactive-bacon
- reactive-banana
- reactive-banana-gi-gtk
- reactive-banana-sdl2
- reactive-banana-threepenny
- reactive-thread
- react-tutorial-haskell-server
- readability
@ -3985,6 +4012,9 @@ broken-packages:
- SableCC2Hs
- safe-buffer-monad
- safe-coerce
- safe-coloured-text-gen
- safe-coloured-text-layout
- safe-coloured-text-terminfo
- safecopy-migrate
- safecopy-store
- safe-freeze
@ -4337,6 +4367,7 @@ broken-packages:
- sparse-lin-alg
- special-functors
- special-keys
- speculate
- speculation
- sphinx
- sphinxesc
@ -4820,6 +4851,7 @@ broken-packages:
- typed-encoding
- typedflow
- typedquery
- typed-time
- typed-wire
- type-eq
- type-fun
@ -4890,6 +4922,7 @@ broken-packages:
- unpack-funcs
- unroll-ghc-plugin
- unsafely
- unsatisfiable
- unsequential
- unused
- uom-plugin
@ -5185,6 +5218,7 @@ broken-packages:
- yahoo-web-search
- yajl
- yall
- yam-app
- yam-config
- yaml-pretty-extras
- YamlReference

11
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -84,12 +84,15 @@ default-package-overrides:
# We can keep this pin at most until base 4.15
- monoid-extras < 0.6
- diagrams-core < 1.5.0
- diagrams-lib < 1.4.4
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0
- hls-explicit-imports-plugin < 1.0.0.2
# 2021-05-12: remove once versions >= 5.0.0 is in stackage
- futhark < 0.19.5
# 2021-06-05: remove once pandoc 2.14 is in stackage
- pandoc-crossref < 0.3.11.0
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -126,6 +129,7 @@ package-maintainers:
berberman:
- nvfetcher
- arch-web
- uusi
bdesham:
- pinboard-notes-backup
cdepillabout:
@ -302,6 +306,12 @@ package-maintainers:
- yarn-lock
- yarn2nix
- large-hashable
- haskell-ci
- diagrams
# owothia
- irc-client
- chatter
- envy
terlar:
- nix-diff
turion:
@ -395,6 +405,7 @@ unsupported-platforms:
PortMidi: [ x86_64-darwin ]
posix-api: [ x86_64-darwin ]
Raincat: [ x86_64-darwin ]
reactive-balsa: [ x86_64-darwin ] # depends on alsa-core
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ]
reflex-dom: [ x86_64-darwin, aarch64-linux ]

122
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View File

@ -1,4 +1,4 @@
# Stackage Nightly 2021-05-19
# Stackage Nightly 2021-06-01
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -11,6 +11,8 @@ default-package-overrides:
- ad ==4.4.1
- adjunctions ==4.4
- adler32 ==0.1.2.0
- aern2-mp ==0.2.6.0
- aern2-real ==0.2.6.0
- aeson ==1.5.6.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
@ -27,7 +29,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-typescript ==0.3.0.1
- aeson-with ==0.1.2.0
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.0
@ -148,10 +150,10 @@ default-package-overrides:
- apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2
- api-maker ==0.1.0.0
- ap-normalize ==0.1.0.0
- ap-normalize ==0.1.0.1
- appar ==0.1.8
- appendmap ==0.1.5
- apply-refact ==0.9.2.0
- apply-refact ==0.9.3.0
- apportionment ==0.0.0.3
- approximate ==0.3.4
- approximate-equality ==1.1.0.2
@ -176,7 +178,7 @@ default-package-overrides:
- asn1-types ==0.3.4
- assert-failure ==0.1.2.5
- assoc ==1.0.2
- astro ==0.4.2.1
- astro ==0.4.3.0
- async ==2.2.3
- async-extra ==0.2.0.0
- async-pool ==0.9.1
@ -201,6 +203,8 @@ default-package-overrides:
- avers ==0.0.17.1
- avro ==0.5.2.0
- aws-cloudfront-signed-cookies ==0.2.0.6
- aws-xray-client ==0.1.0.0
- aws-xray-client-wai ==0.1.0.0
- backprop ==0.2.6.4
- backtracking ==0.1.0
- bank-holidays-england ==0.2.0.6
@ -356,7 +360,7 @@ default-package-overrides:
- cayley-client ==0.4.15
- cborg ==0.2.5.0
- cborg-json ==0.2.2.0
- cdar-mBound ==0.1.0.1
- cdar-mBound ==0.1.0.2
- c-enum ==0.1.0.1
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
@ -391,9 +395,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.3.1.1
- citeproc ==0.3.0.9
- clash-ghc ==1.4.1
- clash-lib ==1.4.1
- clash-prelude ==1.4.1
- clash-ghc ==1.4.2
- clash-lib ==1.4.2
- clash-prelude ==1.4.2
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- clay ==0.13.3
@ -519,6 +523,7 @@ default-package-overrides:
- csp ==1.4.0
- css-syntax ==0.1.0.0
- css-text ==0.1.3.0
- c-struct ==0.1.0.1
- csv ==0.1.2
- ctrie ==0.2
- cubicbezier ==0.6.0.6
@ -573,6 +578,7 @@ default-package-overrides:
- data-textual ==0.3.0.3
- dataurl ==0.1.0.0
- DAV ==1.3.4
- DBFunctor ==0.1.2.1
- dbus ==1.2.17
- dbus-hslogger ==0.1.0.1
- debian ==4.0.2
@ -708,7 +714,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.9
- esqueleto ==3.4.1.1
- esqueleto ==3.5.0.0
- essence-of-live-coding ==0.2.5
- essence-of-live-coding-gloss ==0.2.5
- essence-of-live-coding-pulse ==0.2.5
@ -734,7 +740,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.10
- express ==0.1.12
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
@ -747,18 +753,18 @@ default-package-overrides:
- fakedata-parser ==0.1.0.0
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- faktory ==1.0.2.3
- faktory ==1.0.3.0
- fast-digits ==0.3.0.0
- fast-logger ==3.0.5
- fast-math ==1.0.2
- fb ==2.1.1
- fclabels ==2.0.5
- fclabels ==2.0.5.1
- feature-flags ==0.1.0.1
- fedora-dists ==1.1.2
- fedora-haskell-tools ==0.9
- feed ==1.3.2.0
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fft ==0.1.8.7
- fgl ==5.7.0.3
- file-embed ==0.0.14.0
- file-embed-lzma ==0
@ -938,7 +944,7 @@ default-package-overrides:
- gitrev ==1.3.1
- gi-xlib ==2.0.9
- gl ==0.9
- glabrous ==2.0.3
- glabrous ==2.0.4
- GLFW-b ==3.3.0.0
- Glob ==0.10.1
- gloss ==1.13.2.1
@ -947,6 +953,7 @@ default-package-overrides:
- GLUT ==2.7.0.16
- gluturtle ==0.0.58.1
- gnuplot ==0.5.6.1
- goldplate ==0.2.0
- google-isbn ==1.0.3
- gopher-proxy ==0.1.1.2
- gothic ==0.1.6
@ -974,16 +981,17 @@ default-package-overrides:
- haddock-library ==1.9.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.4
- hal ==0.4.8
- half ==0.3.1
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.4.1.3
- happstack-server ==7.7.0
- happstack-server ==7.7.1
- happy ==1.20.0
- happy-meta ==0.2.0.11
- HasBigDecimal ==0.1.1
- hasbolt ==0.1.4.5
- hasbolt ==0.1.5.0
- hashable ==1.3.0.0
- hashable-time ==0.2.1
- hashids ==1.0.2.4
@ -1240,7 +1248,7 @@ default-package-overrides:
- inline-r ==0.10.4
- inliterate ==0.1.0
- input-parsers ==0.2.2
- insert-ordered-containers ==0.2.4
- insert-ordered-containers ==0.2.5
- inspection-testing ==0.4.5.0
- instance-control ==0.1.2.0
- int-cast ==0.2.0.0
@ -1289,7 +1297,7 @@ default-package-overrides:
- ix-shapable ==0.1.0
- jack ==0.7.2
- jalaali ==1.0.0.0
- jira-wiki-markup ==1.3.4
- jira-wiki-markup ==1.3.5
- jose ==0.8.4
- jose-jwt ==0.9.2
- js-chart ==2.9.4.1
@ -1355,7 +1363,7 @@ default-package-overrides:
- lazyio ==0.1.0.4
- lazysmallcheck ==0.6
- lca ==0.4
- leancheck ==0.9.4
- leancheck ==0.9.6
- leancheck-instances ==0.0.4
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.5
@ -1402,6 +1410,7 @@ default-package-overrides:
- list-t ==1.0.4
- list-transformer ==1.0.7
- ListTree ==0.2.3
- literatex ==0.1.0.0
- little-rio ==0.2.2
- llvm-hs ==9.0.1
- llvm-hs-pure ==9.0.0
@ -1501,7 +1510,7 @@ default-package-overrides:
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- mixed-types-num ==0.5.3.1
- mixed-types-num ==0.5.7.0
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
@ -1519,7 +1528,7 @@ default-package-overrides:
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
- monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.1
- monad-coroutine ==0.9.1.2
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
@ -1597,6 +1606,8 @@ default-package-overrides:
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1
- net-mqtt ==0.7.1.0
- net-mqtt-lens ==0.1.0.0
- netpbm ==1.0.4
- nettle ==0.3.0
- netwire ==5.0.3
@ -1699,7 +1710,7 @@ default-package-overrides:
- pagure-cli ==0.2
- pandoc ==2.13
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-plot ==1.2.1
- pandoc-plot ==1.2.2
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22
- pantry ==0.5.2.1
@ -1716,7 +1727,7 @@ default-package-overrides:
- parsers ==0.12.10
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.8
- partial-semigroup ==0.5.1.12
- password ==3.0.0.0
- password-instances ==3.0.0.0
- password-types ==1.0.0.0
@ -1733,7 +1744,7 @@ default-package-overrides:
- pattern-arrows ==0.0.2
- pava ==0.1.1.1
- pcg-random ==0.1.3.7
- pcre2 ==1.1.4
- pcre2 ==1.1.5
- pcre-heavy ==1.0.0.2
- pcre-light ==0.4.1.0
- pcre-utils ==0.1.8.2
@ -1747,17 +1758,16 @@ default-package-overrides:
- persist ==0.1.1.5
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.11.0.4
- persistent-documentation ==0.1.0.2
- persistent ==2.13.0.2
- persistent-mtl ==0.2.1.0
- persistent-mysql ==2.10.3.1
- persistent-mysql ==2.13.0.1
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.11.0.1
- persistent-qq ==2.9.2.1
- persistent-sqlite ==2.11.1.0
- persistent-template ==2.9.1.0
- persistent-test ==2.0.3.5
- persistent-typed-db ==0.1.0.2
- persistent-postgresql ==2.13.0.1
- persistent-qq ==2.12.0.1
- persistent-sqlite ==2.13.0.3
- persistent-template ==2.12.0.0
- persistent-test ==2.13.0.3
- persistent-typed-db ==0.1.0.4
- pg-harness-client ==0.6.0
- pgp-wordlist ==0.1.0.3
- pg-transact ==0.3.1.1
@ -1917,7 +1927,7 @@ default-package-overrides:
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- rank2classes ==1.4.1
- Rasterific ==0.7.5.3
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.15
- rate-limit ==1.4.2
@ -1936,7 +1946,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.6.1
- record-dot-preprocessor ==0.2.10
- record-dot-preprocessor ==0.2.11
- record-hasfield ==1.0
- records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
@ -2005,8 +2015,8 @@ default-package-overrides:
- rope-utf16-splay ==0.3.2.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.4
- rp-tree ==0.3.5
- rpmbuild-order ==0.4.5
- rp-tree ==0.3.6
- RSA ==2.4.1
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
@ -2034,13 +2044,13 @@ default-package-overrides:
- sandwich-webdriver ==0.1.0.4
- say ==0.1.0.1
- sbp ==2.6.3
- sbv ==8.14
- sbv ==8.15
- scalpel ==0.6.2
- scalpel-core ==0.6.2
- scanf ==0.1.0.0
- scanner ==0.3.1
- scheduler ==1.5.0
- scientific ==0.3.6.2
- scientific ==0.3.7.0
- scotty ==0.12
- scrypt ==0.5.0
- sdl2 ==2.5.3.0
@ -2081,6 +2091,7 @@ default-package-overrides:
- servant-auth-docs ==0.2.10.0
- servant-auth-server ==0.4.6.0
- servant-auth-swagger ==0.2.10.1
- servant-auth-wordpress ==1.0.0.2
- servant-blaze ==0.9.1
- servant-client ==0.18.2
- servant-client-core ==0.18.2
@ -2191,7 +2202,7 @@ default-package-overrides:
- splint ==1.0.1.4
- split ==0.2.3.4
- splitmix ==0.1.0.3
- splitmix-distributions ==0.8.0.0
- splitmix-distributions ==0.9.0.0
- spoon ==0.3.1
- spreadsheet ==0.1.3.8
- sqlcli ==0.2.2.0
@ -2237,6 +2248,7 @@ default-package-overrides:
- streaming-commons ==0.2.2.1
- streamly ==0.7.3
- streams ==3.3
- streamt ==0.5.0.0
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.5
@ -2247,7 +2259,7 @@ default-package-overrides:
- string-combinators ==0.6.0.5
- string-conv ==0.1.2
- string-conversions ==0.4.0.1
- string-interpolate ==0.3.1.0
- string-interpolate ==0.3.1.1
- string-qq ==0.0.4
- string-random ==0.1.4.1
- stringsearch ==0.3.6.6
@ -2322,7 +2334,7 @@ default-package-overrides:
- tasty-test-reporter ==0.1.1.4
- tasty-th ==0.1.7
- tasty-wai ==0.1.1.1
- Taxonomy ==2.1.0
- Taxonomy ==2.2.0
- TCache ==0.12.1
- tce-conf ==1.3
- tdigest ==0.2.1.1
@ -2348,7 +2360,7 @@ default-package-overrides:
- text-builder ==0.6.6.2
- text-conversions ==0.3.1
- text-format ==0.3.2
- text-icu ==0.7.0.1
- text-icu ==0.7.1.0
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.13
- textlocal ==0.1.0.5
@ -2505,12 +2517,12 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.16
- unliftio ==0.2.17
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
- unlit ==0.4.0.0
- unordered-containers ==0.2.13.0
- unordered-containers ==0.2.14.0
- unsafe ==0.0
- urbit-hob ==0.3.3
- uri-bytestring ==0.3.3.0
@ -2542,6 +2554,7 @@ default-package-overrides:
- validity-vector ==0.2.0.3
- valor ==0.1.0.0
- vault ==0.3.1.5
- vcs-ignore ==0.0.1.0
- vec ==0.4
- vector ==0.12.3.0
- vector-algorithms ==0.8.0.4
@ -2563,7 +2576,7 @@ default-package-overrides:
- vformat-aeson ==0.1.0.1
- vformat-time ==0.1.0.0
- ViennaRNAParser ==1.3.3
- vinyl ==0.13.2
- vinyl ==0.13.3
- void ==0.7.3
- vty ==5.33
- wai ==3.2.3
@ -2588,8 +2601,8 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
- warp ==3.3.15
- warp-tls ==3.3.0
- warp ==3.3.16
- warp-tls ==3.3.1
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
- wcwidth ==0.0.2
@ -2610,7 +2623,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.3.1.0
- witch ==0.3.3.0
- witherable ==0.4.1
- within ==0.2.0.1
- with-location ==0.1.0
@ -2621,6 +2634,7 @@ default-package-overrides:
- wl-pprint-text ==1.2.0.1
- word24 ==2.0.1
- word8 ==0.1.3
- wordpress-auth ==1.0.0.1
- word-trie ==0.3.0
- word-wrap ==0.4.1
- world-peace ==1.0.2.0
@ -2664,19 +2678,19 @@ default-package-overrides:
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yamlparse-applicative ==0.1.0.3
- yamlparse-applicative ==0.1.0.4
- yesod ==1.6.1.1
- yesod-auth ==1.6.10.3
- yesod-auth-hashdb ==1.7.1.6
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.6.3.4
- yesod-bin ==1.6.1
- yesod-core ==1.6.20
- yesod-core ==1.6.20.1
- yesod-fb ==0.6.1
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.7
- yesod-page-cursor ==2.0.0.8
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0

50
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -29,6 +29,7 @@ dont-distribute-packages:
- Advgame
- Advise-me
- aern2-real
- aern2-real_0_2_7_0
- AERN-Net
- AERN-Real
- AERN-Real-Double
@ -93,7 +94,6 @@ dont-distribute-packages:
- ApplePush
- approx-rand-test
- arbor-monad-metric-datadog
- arch-hs
- archlinux-web
- arduino-copilot
- arff
@ -399,9 +399,7 @@ dont-distribute-packages:
- claferwiki
- clash
- clash-ghc
- clash-ghc_1_4_2
- clash-lib
- clash-lib_1_4_2
- clash-multisignal
- clash-prelude-quickcheck
- clash-systemverilog
@ -440,6 +438,7 @@ dont-distribute-packages:
- cnc-spec-compiler
- Coadjute
- codec
- code-conjure
- codec-rpm
- codemonitor
- cognimeta-utils
@ -625,8 +624,6 @@ dont-distribute-packages:
- dhall-docs
- dhcp-lease-parser
- dia-functions
- diagrams-braille
- diagrams-builder
- diagrams-haddock
- diagrams-html5
- diagrams-pandoc
@ -782,9 +779,9 @@ dont-distribute-packages:
- extemp
- extensible-data
- extract-dependencies
- extrapolate
- Facts
- factual-api
- fadno-braids
- FailureT
- fakedata-quickcheck
- fallingblocks
@ -970,7 +967,6 @@ dont-distribute-packages:
- global-config
- glome-hs
- GlomeView
- gloss-banana
- gloss-devil
- gloss-examples
- gloss-sodium
@ -1086,28 +1082,8 @@ dont-distribute-packages:
- hadoop-tools
- haggis
- hails-bin
- hakyll-agda
- hakyll-alectryon
- hakyll-blaze-templates
- hakyll-contrib
- hakyll-contrib-csv
- hakyll-contrib-elm
- hakyll-contrib-hyphenation
- hakyll-contrib-i18n
- hakyll-contrib-links
- hakyll-dhall
- hakyll-dir-list
- hakyll-elm
- hakyll-favicon
- hakyll-filestore
- hakyll-images
- hakyll-ogmarkup
- hakyll-process
- hakyll-R
- hakyll-sass
- hakyll-series
- hakyll-shakespeare
- hakyll-shortcut-links
- hakyll-typescript
- halberd
- hall-symbols
@ -1351,10 +1327,10 @@ dont-distribute-packages:
- HLearn-datastructures
- HLearn-distributions
- hledger-api
- hlrdb
- hls
- hly
- hmark
- hmatrix-sundials
- hmeap
- hmeap-utils
- hmep
@ -1610,7 +1586,6 @@ dont-distribute-packages:
- iteratee-parsec
- iteratee-stm
- iterio-server
- iterm-show-diagrams
- iter-stats
- ivor
- ivory-avr-atmega328p-registers
@ -1680,7 +1655,6 @@ dont-distribute-packages:
- karakuri
- katip-elasticsearch
- katip-rollbar
- kawaii
- keera-hails-i18n
- keera-hails-mvc-environment-gtk
- keera-hails-mvc-model-lightmodel
@ -1917,7 +1891,6 @@ dont-distribute-packages:
- marquise
- marvin
- masakazu-bot
- master-plan
- matchers
- mathblog
- mathlink
@ -2000,6 +1973,7 @@ dont-distribute-packages:
- Monocle
- monte-carlo
- moo
- moo-nad
- morley
- morloc
- morphisms-functors-inventory
@ -2118,6 +2092,7 @@ dont-distribute-packages:
- NoSlow
- notmuch-haskell
- notmuch-web
- nri-prelude_0_6_0_1
- numerical
- numeric-ode
- numhask-hedgehog
@ -2344,7 +2319,6 @@ dont-distribute-packages:
- push-notify-apn
- push-notify-ccs
- push-notify-general
- puzzle-draw
- puzzle-draw-cmdline
- pvd
- qd-vec
@ -2417,18 +2391,10 @@ dont-distribute-packages:
- rdioh
- react-flux-servant
- reactive
- reactive-balsa
- reactive-banana-automation
- reactive-banana-bunch
- reactive-banana-gi-gtk
- reactive-banana-sdl
- reactive-banana-sdl2
- reactive-banana-threepenny
- reactive-banana-wx
- reactive-fieldtrip
- reactive-glut
- reactive-jack
- reactive-midyim
- reactor
- readline-statevar
- readpyc
@ -2559,6 +2525,7 @@ dont-distribute-packages:
- ruler-core
- runtime-arbitrary
- S3
- safe-coloured-text-layout-gen
- safe-numeric
- safer-file-handles
- safer-file-handles-bytestring
@ -2929,7 +2896,6 @@ dont-distribute-packages:
- tensorflow-core-ops
- tensorflow-logging
- tensorflow-ops
- termbox-banana
- terminal-text
- terrahs
- testbench
@ -3248,6 +3214,7 @@ dont-distribute-packages:
- yajl-enumerator
- yam
- yam-datasource
- yam-job
- yam-logger
- yaml-rpc-scotty
- yaml-rpc-snap
@ -3255,6 +3222,7 @@ dont-distribute-packages:
- yam-redis
- yam-transaction
- yam-transaction-odbc
- yam-transaction-postgresql
- yam-web
- yarr-image-io
- yavie

14
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -819,4 +819,18 @@ self: super: builtins.intersectAttrs super {
# itself causing an infinite recursion at evaluation
# time
random = dontCheck super.random;
# Since this package is primarily used by nixpkgs maintainers and is probably
# not used to link against by anyone, we can make it’s closure smaller.
cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable;
# test suite needs local redis daemon
nri-redis = dontCheck super.nri-redis;
# Make tophat find itself for _compiling_ its test suite
tophat = overrideCabal super.tophat (drv: {
postPatch = ''
sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs
'' + (drv.postPatch or "");
});
}

2665
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

65
pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch
View File

@ -1,65 +0,0 @@
From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 14 Aug 2020 17:52:28 +0200
Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound
---
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal
index 93d0b77..60c2312 100644
--- a/jsaddle-webkit2gtk.cabal
+++ b/jsaddle-webkit2gtk.cabal
@@ -35,7 +35,7 @@ library
gi-gtk >=3.0.17 && <3.1,
gi-webkit2 >=4.0.14 && <4.1,
gi-javascriptcore >=4.0.14 && <4.1,
- haskell-gi-base >=0.20 && <0.24,
+ haskell-gi-base >=0.20 && <0.26,
haskell-gi-overloading >=0.0 && < 2.0,
jsaddle >=0.9.4.0 && <0.10,
text >=1.2.1.3 && <1.3,
From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 14 Aug 2020 18:10:26 +0200
Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable
Those two convenience definitions disappeared from gi-gio and gi-gtk in
newer versions.
---
.../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs
index 898dac2..5249477 100644
--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs
+++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs
@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF
import qualified GI.Gtk as Gtk (main, init)
import GI.Gtk
(windowSetPosition, windowSetDefaultSize, windowNew,
- scrolledWindowNew, noAdjustment, containerAdd,
+ scrolledWindowNew, Adjustment, containerAdd,
WindowType(..), WindowPosition(..), widgetDestroy,
widgetGetToplevel, widgetShowAll, onWidgetDestroy,
mainQuit)
-import GI.Gio (noCancellable)
+import GI.Gio (Cancellable)
import GI.JavaScriptCore (valueToString)
import GI.WebKit2
(scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,
@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)
import Language.Javascript.JSaddle.Run (runJavaScript)
import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
+noAdjustment :: Maybe Adjustment
+noAdjustment = Nothing
+
+noCancellable :: Maybe Cancellable
+noCancellable = Nothing
+
quitWebView :: WebView -> IO ()
quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
widgetDestroy w

22
pkgs/development/libraries/glibc/common.nix
View File

@ -228,6 +228,28 @@ stdenv.mkDerivation ({
libc_cv_c_cleanup=yes
libc_cv_gnu89_inline=yes
EOF
# ./configure has logic like
#
# AR=`$CC -print-prog-name=ar`
#
# This searches various directories in the gcc and its wrapper. In nixpkgs,
# this returns the bare string "ar", which is build ar. This can result as
# a build failure with the following message:
#
# libc_pic.a: error adding symbols: archive has no index; run ranlib to add one
#
# (Observed cross compiling from aarch64-linux -> armv7l-linux).
#
# Nixpkgs passes a correct value for AR and friends, so to use the correct
# set of tools, we only need to delete this special handling.
sed -i \
-e '/^AR=/d' \
-e '/^AS=/d' \
-e '/^LD=/d' \
-e '/^OBJCOPY=/d' \
-e '/^OBJDUMP=/d' \
$configureScript
'';
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";

17
pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
View File

@ -1,22 +1,23 @@
{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }:
{ lib, fetchurl, buildDunePackage, ppxlib }:
buildDunePackage rec {
pname = "ppx_gen_rec";
version = "1.1.0";
useDune2 = true;
version = "2.0.0";
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "0fwi4bknq8h9zgpsarjvnzdm9bm8qlyyw0lz30pihg02aiiljqbh";
sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk=";
};
buildInputs = [ ocaml-migrate-parsetree ];
minimumOCamlVersion = "4.07";
useDune2 = true;
buildInputs = [ ppxlib ];
meta = with lib; {
homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec";
description = "ocaml preprocessor that generates a recursive module";
description = "A ppx rewriter that transforms a recursive module expression into a struct.";
license = licenses.mit;
maintainers = [ maintainers.frontsideair ];
maintainers = with maintainers; [ frontsideair ];
};
}

6
pkgs/development/web/flyctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.220";
version = "0.0.222";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-QuNe2Q7d0WSF3pkDNKxs6b6hO9Q99oJM+ZddHD/tOaI=";
sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4=";
};
preBuild = ''
@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
vendorSha256 = "sha256-zoheYyeofg8oVRicnZt+lFOixIH/Ssv7Kh7zC6yT/uY=";
vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc=";
doCheck = false;

4
pkgs/misc/vim-plugins/vim-utils.nix
View File

@ -341,10 +341,10 @@ let
beforePlugins
vamImpl
(nativeImpl packages)
customRC
]
++ lib.optional (pathogen != null) pathogenImpl
++ lib.optional (plug != null) plugImpl;
++ lib.optional (plug != null) plugImpl
++ [ customRC ];
in
lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries);

3
pkgs/servers/matrix-appservice-discord/default.nix
View File

@ -43,7 +43,8 @@ in mkYarnPackage rec {
doCheck = true;
checkPhase = ''
yarn --offline test
# the default 2000ms timeout is sometimes too short on our busy builders
yarn --offline test --timeout 10000
'';
postInstall = ''

4
pkgs/tools/admin/acme.sh/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }:
stdenv.mkDerivation rec {
pname = "acme.sh";
version = "2.8.9";
version = "2.9.0";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk=";
sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/backup/bacula/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bacula";
version = "11.0.3";
version = "11.0.5";
src = fetchurl {
url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw=";
sha256 = "sha256-71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo=";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-06-03";
version = "2021-06-05";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-a2x9Hfo39VeaMsio9VbOPe5hr2xLjmAzlSNUWtaXG6A=";
sha256 = "sha256-91BJ0rgR9pP4rlLz38Tug0Cd5s7WajgdxA7Dtm4Pre0=";
};
installPhase = ''

2
pkgs/top-level/all-packages.nix
View File

@ -4340,6 +4340,8 @@ in
uudeview = callPackage ../tools/misc/uudeview { };
uusi = haskell.lib.justStaticExecutables haskellPackages.uusi;
uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
inherit (python3Packages) sphinx;
inherit (darwin.apple_sdk.frameworks) Security;

2
pkgs/top-level/release-haskell.nix
View File

@ -175,6 +175,7 @@ let
nix-tree
nixfmt
nota
nvfetcher
ormolu
pandoc
pakcs
@ -199,6 +200,7 @@ let
tldr-hs
tweet-hs
update-nix-fetchgit
uusi
uqm
uuagc
vaultenv