b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nixpkgs/master' into staging-next

Browse source
This commit is contained in:
Alyssa Ross 2021-09-03 18:23:45 +00:00
parent ce434a97e2 117b5074bf
commit 071a7a4583
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
69 changed files with 2108 additions and 1535 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/languages-frameworks/javascript.section.md
View file

@ -2,7 +2,7 @@
## Introduction {#javascript-introduction} ## Introduction {#javascript-introduction}
This contains instructions on how to package javascript applications. For instructions on how to add a cli package from npm please consult the #node.js section This contains instructions on how to package javascript applications.
The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given.

12
maintainers/maintainer-list.nix
View file

@ -80,6 +80,12 @@
githubId = 791309; githubId = 791309;
name = "Jan Hrnko"; name = "Jan Hrnko";
}; };
_1000teslas = {
name = "Kevin Tran";
email = "47207223+1000teslas@users.noreply.github.com";
github = "1000teslas";
githubId = 47207223;
};
_3699n = { _3699n = {
email = "nicholas@nvk.pm"; email = "nicholas@nvk.pm";
github = "3699n"; github = "3699n";
@ -3621,6 +3627,12 @@
fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672";
}]; }];
}; };
flexagoon = {
email = "flexagoon@pm.me";
github = "flexagoon";
githubId = 66178592;
name = "Pavel Zolotarevskiy";
};
flexw = { flexw = {
email = "felix.weilbach@t-online.de"; email = "felix.weilbach@t-online.de";
github = "FlexW"; github = "FlexW";

2
nixos/modules/misc/crashdump.nix
View file

@ -50,7 +50,7 @@ in
boot = { boot = {
postBootCommands = '' postBootCommands = ''
echo "loading crashdump kernel..."; echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \ ${pkgs.kexec-tools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \ --initrd=/run/current-system/initrd \
--reset-vga --console-vga \ --reset-vga --console-vga \
--command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" --command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"

2
nixos/modules/services/desktops/pipewire/pipewire.nix
View file

@ -194,7 +194,7 @@ in {
}; };
environment.sessionVariables.LD_LIBRARY_PATH = environment.sessionVariables.LD_LIBRARY_PATH =
lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; lib.optional cfg.jack.enable "${cfg.package.jack}/lib";
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554 # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/464#note_723554
systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1"; systemd.user.services.pipewire.environment."PIPEWIRE_LINK_PASSIVE" = "1";

6
nixos/modules/system/boot/kexec.nix
View file

@ -1,8 +1,8 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) { config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
environment.systemPackages = [ pkgs.kexectools ]; environment.systemPackages = [ pkgs.kexec-tools ];
systemd.services.prepare-kexec = systemd.services.prepare-kexec =
{ description = "Preparation for kexec"; { description = "Preparation for kexec";
@ -10,7 +10,7 @@
before = [ "systemd-kexec.service" ]; before = [ "systemd-kexec.service" ];
unitConfig.DefaultDependencies = false; unitConfig.DefaultDependencies = false;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
path = [ pkgs.kexectools ]; path = [ pkgs.kexec-tools ];
script = script =
'' ''
# Don't load the current system profile if we already have a kernel loaded # Don't load the current system profile if we already have a kernel loaded

4
pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix
View file

@ -2,11 +2,11 @@
trivialBuild rec { trivialBuild rec {
pname = "ebuild-mode"; pname = "ebuild-mode";
version = "1.52"; version = "1.53";
src = fetchurl { src = fetchurl {
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h"; sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l";
}; };
meta = with lib; { meta = with lib; {

9
pkgs/applications/editors/vscode/generic.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem { stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, buildFHSUserEnvBubblewrap , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
, writeShellScriptBin , writeShellScriptBin
# Populate passthru.tests # Populate passthru.tests
@ -101,6 +101,13 @@ let
runHook postInstall runHook postInstall
''; '';
preFixup = ''
gappsWrapperArgs+=(
# Add gio to PATH so that moving files to the trash works when not using a desktop environment
--prefix PATH : ${glib.bin}/bin
)
'';
inherit meta; inherit meta;
}; };

8
pkgs/applications/terminal-emulators/termonad/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }: { stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }:
let let
termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self); termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self);
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "termonad-with-packages-${termonadEnv.version}"; name = "termonad-with-packages-${termonadEnv.version}";
@ -16,4 +16,8 @@ in stdenv.mkDerivation {
# trivial derivation # trivial derivation
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
meta = haskellPackages.termonad.meta // {
mainProgram = "termonad";
};
} }

10
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,13 +1,13 @@
{ {
"version": "14.2.1", "version": "14.2.3",
"repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z", "repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v14.2.1-ee", "rev": "v14.2.3-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "14.2.1", "GITALY_SERVER_VERSION": "14.2.3",
"GITLAB_PAGES_VERSION": "1.42.0", "GITLAB_PAGES_VERSION": "1.42.0",
"GITLAB_SHELL_VERSION": "13.19.1", "GITLAB_SHELL_VERSION": "13.19.1",
"GITLAB_WORKHORSE_VERSION": "14.2.1" "GITLAB_WORKHORSE_VERSION": "14.2.3"
} }
} }

6
pkgs/applications/version-management/gitlab/default.nix
View file

@ -22,6 +22,12 @@ let
gemset = gemset =
let x = import (gemdir + "/gemset.nix"); let x = import (gemdir + "/gemset.nix");
in x // { in x // {
# grpc expects the AR environment variable to contain `ar rpc`. See the
# discussion in nixpkgs #63056.
grpc = x.grpc // {
patches = [ ./fix-grpc-ar.patch ];
dontBuild = false;
};
# the openssl needs the openssl include files # the openssl needs the openssl include files
openssl = x.openssl // { openssl = x.openssl // {
buildInputs = [ openssl ]; buildInputs = [ openssl ];

10
pkgs/applications/version-management/gitlab/fix-grpc-ar.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/src/ruby/ext/grpc/extconf.rb
+++ b/src/ruby/ext/grpc/extconf.rb
@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
if ENV['AR'].nil? || ENV['AR'].size == 0
ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
end
+ENV['AR'] = ENV['AR'] + ' rcs'
if ENV['CC'].nil? || ENV['CC'].size == 0
ENV['CC'] = RbConfig::CONFIG['CC']
end

4
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file

@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
gem 'rdoc', '~> 6.0' gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.38.0' gem 'grpc', '~> 1.30.2'
gem 'sentry-raven', '~> 3.0', require: false gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0' gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false gem 'rbtrace', require: false
@ -29,5 +29,5 @@ group :development, :test do
gem 'factory_bot', require: false gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false gem 'pry', '~> 0.12.2', require: false
gem 'grpc-tools', '= 1.38.0' gem 'grpc-tools', '= 1.30.2'
end end

10
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file

@ -77,10 +77,10 @@ GEM
google-protobuf (3.17.3) google-protobuf (3.17.3)
googleapis-common-protos-types (1.1.0) googleapis-common-protos-types (1.1.0)
google-protobuf (~> 3.14) google-protobuf (~> 3.14)
grpc (1.38.0) grpc (1.30.2)
google-protobuf (~> 3.15) google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0) googleapis-common-protos-types (~> 1.0)
grpc-tools (1.38.0) grpc-tools (1.30.2)
i18n (1.8.10) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ice_nine (0.11.2) ice_nine (0.11.2)
@ -225,8 +225,8 @@ DEPENDENCIES
gitlab-labkit (~> 0.20.0) gitlab-labkit (~> 0.20.0)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.17.0) google-protobuf (~> 3.17.0)
grpc (~> 1.38.0) grpc (~> 1.30.2)
grpc-tools (= 1.38.0) grpc-tools (= 1.30.2)
licensee (~> 9.14.1) licensee (~> 9.14.1)
pry (~> 0.12.2) pry (~> 0.12.2)
rbtrace rbtrace

14
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -9,8 +9,18 @@ let
inherit ruby; inherit ruby;
copyGemFiles = true; copyGemFiles = true;
gemdir = ./.; gemdir = ./.;
gemset =
let x = import (gemdir + "/gemset.nix");
in x // {
# grpc expects the AR environment variable to contain `ar rpc`. See the
# discussion in nixpkgs #63056.
grpc = x.grpc // {
patches = [ ../fix-grpc-ar.patch ];
dontBuild = false;
};
};
}; };
version = "14.2.1"; version = "14.2.3";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in in
@ -22,7 +32,7 @@ buildGoModule {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc="; sha256 = "sha256-TSA5CoNaLeMu7O02rsaR/rNciLwzxSIUUQsCo40Z15c=";
}; };
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE="; vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";

8
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View file

@ -311,20 +311,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
type = "gem"; type = "gem";
}; };
version = "1.38.0"; version = "1.30.2";
}; };
grpc-tools = { grpc-tools = {
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq"; sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
type = "gem"; type = "gem";
}; };
version = "1.38.0"; version = "1.30.2";
}; };
i18n = { i18n = {
dependencies = ["concurrent-ruby"]; dependencies = ["concurrent-ruby"];

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "14.2.1"; version = "14.2.3";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;

6
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file

@ -101,7 +101,7 @@ gem 'graphql', '~> 1.11.8'
# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
# https://gitlab.com/gitlab-org/gitlab/issues/31747 # https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4.10' gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.2' gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.21.0' gem 'gitlab-labkit', '~> 0.21.1'
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
gem 'thrift', '>= 0.14.0' gem 'thrift', '>= 0.14.0'
@ -479,7 +479,7 @@ gem 'gitaly', '~> 14.2.0.pre.rc2'
# KAS GRPC protocol definitions # KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2' gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.38.0' gem 'grpc', '~> 1.30.2'
gem 'google-protobuf', '~> 3.17.1' gem 'google-protobuf', '~> 3.17.1'

18
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file

@ -73,9 +73,9 @@ GEM
aes_key_wrap (1.1.0) aes_key_wrap (1.1.0)
akismet (3.0.0) akismet (3.0.0)
android_key_attestation (0.3.0) android_key_attestation (0.3.0)
apollo_upload_server (2.0.2) apollo_upload_server (2.1.0)
actionpack (>= 4.2)
graphql (>= 1.8) graphql (>= 1.8)
rails (>= 4.2)
asana (0.10.3) asana (0.10.3)
faraday (~> 1.0) faraday (~> 1.0)
faraday_middleware (~> 1.0) faraday_middleware (~> 1.0)
@ -468,10 +468,10 @@ GEM
fog-json (~> 1.2.0) fog-json (~> 1.2.0)
mime-types mime-types
ms_rest_azure (~> 0.12.0) ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.21.0) gitlab-labkit (0.21.1)
actionpack (>= 5.0.0, < 7.0.0) actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0)
grpc (~> 1.38) grpc (~> 1.30.2)
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
opentracing (~> 0.4) opentracing (~> 0.4)
pg_query (~> 2.1) pg_query (~> 2.1)
@ -566,8 +566,8 @@ GEM
graphql (~> 1.6) graphql (~> 1.6)
html-pipeline (~> 2.8) html-pipeline (~> 2.8)
sass (~> 3.4) sass (~> 3.4)
grpc (1.38.0) grpc (1.30.2)
google-protobuf (~> 3.15) google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0) googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0) gssapi (1.2.0)
ffi (>= 1.0.1) ffi (>= 1.0.1)
@ -1385,7 +1385,7 @@ DEPENDENCIES
acts-as-taggable-on (~> 7.0) acts-as-taggable-on (~> 7.0)
addressable (~> 2.8) addressable (~> 2.8)
akismet (~> 3.0) akismet (~> 3.0)
apollo_upload_server (~> 2.0.2) apollo_upload_server (~> 2.1.0)
asana (~> 0.10.3) asana (~> 0.10.3)
asciidoctor (~> 2.0.10) asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1) asciidoctor-include-ext (~> 0.3.1)
@ -1471,7 +1471,7 @@ DEPENDENCIES
gitlab-dangerfiles (~> 2.3.0) gitlab-dangerfiles (~> 2.3.0)
gitlab-experiment (~> 0.6.4) gitlab-experiment (~> 0.6.4)
gitlab-fog-azure-rm (~> 1.1.1) gitlab-fog-azure-rm (~> 1.1.1)
gitlab-labkit (~> 0.21.0) gitlab-labkit (~> 0.21.1)
gitlab-license (~> 2.0) gitlab-license (~> 2.0)
gitlab-mail_room (~> 0.0.9) gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
@ -1493,7 +1493,7 @@ DEPENDENCIES
graphlient (~> 0.4.0) graphlient (~> 0.4.0)
graphql (~> 1.11.8) graphql (~> 1.11.8)
graphql-docs (~> 1.6.0) graphql-docs (~> 1.6.0)
grpc (~> 1.38.0) grpc (~> 1.30.2)
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.36.0) haml_lint (~> 0.36.0)

14
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file

@ -195,15 +195,15 @@
version = "0.3.0"; version = "0.3.0";
}; };
apollo_upload_server = { apollo_upload_server = {
dependencies = ["graphql" "rails"]; dependencies = ["actionpack" "graphql"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xk54h9mmzhrbgbmk33v38pavb8w6421mx2yrgsdarkfl9fr90y3"; sha256 = "0klhppx4vjfdvgz12wb63bcxy5ymk0mp8wkh01fpgjn2l3fwkwz5";
type = "gem"; type = "gem";
}; };
version = "2.0.2"; version = "2.1.0";
}; };
asana = { asana = {
dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
@ -1987,10 +1987,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0dzdxrn2ra21nyfnabj44fbwbccjkp3i7cjpym99pzbsx8dkna8z"; sha256 = "09xci7jw5sckagnwfjlglz4cywylrf16r83f82asnnngvxadvvmq";
type = "gem"; type = "gem";
}; };
version = "0.21.0"; version = "0.21.1";
}; };
gitlab-license = { gitlab-license = {
groups = ["default"]; groups = ["default"];
@ -2278,10 +2278,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
type = "gem"; type = "gem";
}; };
version = "1.38.0"; version = "1.30.2";
}; };
gssapi = { gssapi = {
dependencies = ["ffi"]; dependencies = ["ffi"];

16
pkgs/data/fonts/helvetica-neue-lt-std/default.nix
View file

@ -1,21 +1,21 @@
{ lib, fetchzip }: { lib, fetchzip }:
let let
version = "2013.06.07"; # date of most recent file in distribution version = "2014.08.16"; # date of most recent file in distribution
in fetchzip { in fetchzip {
name = "helvetica-neue-lt-std-${version}"; name = "helvetica-neue-lt-std-${version}";
url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip";
postFetch = '' postFetch = ''
mkdir -p $out/share/fonts mkdir -p $out/share/fonts
unzip -j $downloadedFile Helvetica\ Neue\ LT\ Std/\*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile "Helvetica Neue LT Std/*.otf" -d $out/share/fonts/opentype
''; '';
sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9";
meta = { meta = with lib; {
homepage = "http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; homepage = "https://web.archive.org/web/20190926040940/http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html";
description = "Helvetica Neue LT Std font"; description = "Helvetica Neue LT Std font";
longDescription = '' longDescription = ''
Helvetica Neue Lt Std is one of the most highly rated and complete Helvetica Neue Lt Std is one of the most highly rated and complete
@ -28,8 +28,8 @@ in fetchzip {
font. The numbers are well spaced and defined with high accuracy. The font. The numbers are well spaced and defined with high accuracy. The
punctuation marks are heavily detailed as well. punctuation marks are heavily detailed as well.
''; '';
license = lib.licenses.unfree; license = licenses.unfree;
maintainers = [ lib.maintainers.romildo ]; platforms = platforms.all;
platforms = lib.platforms.all; maintainers = with maintainers; [ romildo ];
}; };
} }

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

@ -1,6 +1,6 @@
{ {
"commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e", "commit": "193a13be44c51ebfc8e991b7bb53a4065129ff4d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/193a13be44c51ebfc8e991b7bb53a4065129ff4d.tar.gz",
"sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764", "sha256": "08j6qx3jqcw7ydwnpjr132l2mlpq6dqvwqgm3gq0ym4kjzrbdwsd",
"msg": "Update from Hackage at 2021-08-17T22:21:14Z" "msg": "Update from Hackage at 2021-08-23T13:50:03Z"
} }

2
pkgs/development/compilers/ghc/8.10.2-binary.nix
View file

@ -374,6 +374,6 @@ stdenv.mkDerivation rec {
# `pkgsMusl`. # `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName}; platforms = builtins.attrNames ghcBinDists.${distSetName};
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet ]; maintainers = with lib.maintainers; [ lostnet guibou ];
}; };
} }

17
pkgs/development/compilers/ghc/8.10.5-binary.nix → pkgs/development/compilers/ghc/8.10.7-binary.nix
View file

@ -17,7 +17,8 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
let let
downloadsUrl = "https://downloads.haskell.org/ghc"; downloadsUrl = "https://downloads.haskell.org/ghc";
version = "8.10.5"; # Copy sha256 from https://downloads.haskell.org/~ghc/8.10.7/SHA256SUMS
version = "8.10.7";
# Information about available bindists that we use in the build. # Information about available bindists that we use in the build.
# #
@ -42,7 +43,7 @@ let
i686-linux = { i686-linux = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
sha256 = "17cwmhhyz952psmp4j3pkdj0yrfxah3l2dawg5s4hdr228n5pjqc"; sha256 = "fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab";
}; };
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [ archSpecificLibraries = [
@ -55,7 +56,7 @@ let
x86_64-linux = { x86_64-linux = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
sha256 = "11v76wgljyszc6mgz6r16i6wkifgl15a26q7ablihp2cr8h3qqmw"; sha256 = "a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30";
}; };
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [ archSpecificLibraries = [
@ -65,7 +66,7 @@ let
armv7l-linux = { armv7l-linux = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz";
sha256 = "0v5bvhb2z9j26yr0n9gc4xdq2lm37mr98g62p5z8pqahhhd0s5sn"; sha256 = "3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2";
}; };
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [ archSpecificLibraries = [
@ -75,7 +76,7 @@ let
aarch64-linux = { aarch64-linux = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
sha256 = "1p0dgyn1m2nd8ax1g25lchaz9z2nk9jvyzf63biarq7qlzc5q24s"; sha256 = "fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55";
}; };
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [ archSpecificLibraries = [
@ -86,7 +87,7 @@ let
x86_64-darwin = { x86_64-darwin = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "08javwfqd21kglbr1bnhnbjw2cggz1n668vi8kx5hbcnz3plf3zg"; sha256 = "287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047";
}; };
exePathForLibraryCheck = null; # we don't have a library check for darwin yet exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [ archSpecificLibraries = [
@ -97,7 +98,7 @@ let
aarch64-darwin = { aarch64-darwin = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
sha256 = "02fbcrzcc6m25z3ji867isml38jkg4blry70ljwl3l03zxq4ws03"; sha256 = "dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c";
}; };
exePathForLibraryCheck = null; # we don't have a library check for darwin yet exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [ archSpecificLibraries = [
@ -111,7 +112,7 @@ let
x86_64-linux = { x86_64-linux = {
src = { src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz";
sha256 = "1ql2qxywbbv0b9syvrm9kyh5d8midnl676lw4698ajras6gcvmzl"; sha256 = "16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c";
}; };
exePathForLibraryCheck = "bin/ghc"; exePathForLibraryCheck = "bin/ghc";
archSpecificLibraries = [ archSpecificLibraries = [

10
pkgs/development/compilers/ghc/8.10.6.nix → pkgs/development/compilers/ghc/8.10.7.nix
View file

@ -137,12 +137,12 @@ let
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = "8.10.6"; version = "8.10.7";
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
src = fetchurl { src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9"; sha256 = "e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -285,6 +285,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie"; ++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = '' postInstall = ''
# Install the bash completion file. # Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -310,7 +314,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ]; maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600; timeout = 24 * 3600;
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;

1
pkgs/development/compilers/ghc/8.6.5-binary.nix
View file

@ -192,5 +192,6 @@ stdenv.mkDerivation rec {
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;
# build segfaults, use ghc8102Binary which has proper musl support instead # build segfaults, use ghc8102Binary which has proper musl support instead
broken = stdenv.hostPlatform.isMusl; broken = stdenv.hostPlatform.isMusl;
maintainers = with lib.maintainers; [ guibou ];
}; };
} }

2
pkgs/development/compilers/ghc/8.8.4.nix
View file

@ -317,7 +317,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ]; maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600; timeout = 24 * 3600;
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;

6
pkgs/development/compilers/ghc/9.0.1.nix
View file

@ -269,6 +269,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie"; ++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = '' postInstall = ''
# Install the bash completion file. # Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -294,7 +298,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ]; maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600; timeout = 24 * 3600;
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;

320
pkgs/development/compilers/ghc/9.2.1.nix Normal file
View file

@ -0,0 +1,320 @@
{ lib, stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr
, bash
, libiconv ? null, ncurses
, glibcLocales ? null
, # GHC can be built with system libffi or a bundled one.
libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
# aarch64 outputs otherwise exceed 2GB limit
, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
(if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to build sphinx documentation.
enableDocs ? (
# Docs disabled for musl and cross because it's a large task to keep
# all `sphinx` dependencies building in those environments.
# `sphinx` pullls in among others:
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
(stdenv.targetPlatform == stdenv.hostPlatform)
&& !stdenv.hostPlatform.isMusl
)
, enableHaddockProgram ?
# Disabled for cross; see note [HADDOCK_DOCS].
(stdenv.targetPlatform == stdenv.hostPlatform)
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
# Cross cannot currently build the `haddock` program for silly reasons,
# see note [HADDOCK_DOCS].
assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram;
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
inherit (bootPkgs) ghc;
# TODO(@Ericson2314) Make unconditional
targetPrefix = lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
buildMK = ''
BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk
endif
BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
BUILD_SPHINX_PDF = NO
'' +
# Note [HADDOCK_DOCS]:
# Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
# program is built (which we generally always want to have a complete GHC install)
# and whether it is run on the GHC sources to generate hyperlinked source code
# (which is impossible for cross-compilation); see:
# https://gitlab.haskell.org/ghc/ghc/-/issues/20077
# This implies that currently a cross-compiled GHC will never have a `haddock`
# program, so it can never generate haddocks for any packages.
# If this is solved in the future, we'd like to unconditionally
# build the haddock program (removing the `enableHaddockProgram` option).
''
HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
CrossCompilePrefix = ${targetPrefix}
'' + lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn"
'' + lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
'';
# Splicer will pull out correct variations
libDeps = platform: lib.optional enableTerminfo ncurses
++ [libffi]
++ lib.optional (!enableIntegerSimple) gmp
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
version = "9.2.0.20210821";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
postPatch = "patchShebangs .";
# GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8";
# GHC is a bit confused on its cross terminology.
preConfigure = ''
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
export "''${env#TARGET_}=''${!env}"
done
# GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
'' + lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
'' + lib.optionalString targetPlatform.isMusl ''
echo "patching llvm-targets for musl targets..."
echo "Cloning these existing '*-linux-gnu*' targets:"
grep linux-gnu llvm-targets | sed 's/^/ /'
echo "(go go gadget sed)"
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
echo "llvm-targets now contains these '*-linux-musl*' targets:"
grep linux-musl llvm-targets | sed 's/^/ /'
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
for x in configure aclocal.m4; do
substituteInPlace $x \
--replace '*-android*|*-gnueabi*)' \
'*-android*|*-gnueabi*|*-musleabi*)'
done
'';
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ lib.optional (targetPlatform != hostPlatform) "target";
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ lib.optionals (libffi != null) [
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ lib.optionals useLdGold [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;
# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): use XATTR env var after backport of
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ lib.optional useLLVM llvmPackages.llvm;
depsTargetTarget = map lib.getDev (libDeps targetPlatform);
depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
checkTarget = "test";
hardeningDisable =
[ "format" ]
# In nixpkgs, musl based builds currently enable `pie` hardening by default
# (see `defaultHardeningFlags` in `make-derivation.nix`).
# But GHC cannot currently produce outputs that are ready for `-pie` linking.
# Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
# See:
# * https://github.com/NixOS/nixpkgs/issues/129247
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
# Patch scripts to include "readelf" and "cat" in $PATH.
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';
passthru = {
inherit bootPkgs targetPrefix;
inherit llvmPackages;
inherit enableShared;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
# integer-simple builds are broken when GHC links against musl.
# See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743.
# Linker failure on macOS:
# https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726
broken = (enableIntegerSimple && hostPlatform.isMusl)
|| stdenv.hostPlatform.isDarwin;
};
} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})

12
pkgs/development/compilers/ghc/head.nix
View file

@ -2,7 +2,7 @@
# build-tools # build-tools
, bootPkgs , bootPkgs
, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx , autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx, xattr
, bash , bash
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -256,6 +256,10 @@ stdenv.mkDerivation (rec {
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
] ++ lib.optionals enableDocs [ ] ++ lib.optionals enableDocs [
sphinx sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): use XATTR env var once we have
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
]; ];
# For building runtime libs # For building runtime libs
@ -286,6 +290,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie"; ++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = '' postInstall = ''
# Install the bash completion file. # Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -311,7 +319,7 @@ stdenv.mkDerivation (rec {
meta = { meta = {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ]; maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600; timeout = 24 * 3600;
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
# ghcHEAD times out on aarch64-linux on Hydra. # ghcHEAD times out on aarch64-linux on Hydra.

6
pkgs/development/haskell-modules/cabal2nix-unstable.nix
View file

@ -8,10 +8,10 @@
}: }:
mkDerivation { mkDerivation {
pname = "cabal2nix"; pname = "cabal2nix";
version = "unstable-2021-08-21"; version = "unstable-2021-08-27";
src = fetchzip { src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz"; url = "https://github.com/NixOS/cabal2nix/archive/05b1b404e20eb6252f93c821d4d7974ab7277d90.tar.gz";
sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x"; sha256 = "03zvp3wwqph9niadgbvkfcqabafgyhnw12r09cw23hm69hsb64d5";
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;

16
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -120,14 +120,6 @@ self: super: {
# Jailbreak is necessary for QuickCheck dependency. # Jailbreak is necessary for QuickCheck dependency.
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
# Test suite fails due golden tests checking text representation
# of normalized dhall expressions, and newer dhall versions format
# differently.
hpack-dhall =
if pkgs.lib.versionOlder "0.5.2" super.hpack-dhall.version
then throw "Drop dontCheck override for hpack-dhall > 0.5.2"
else dontCheck super.hpack-dhall;
inline-c-cpp = overrideCabal super.inline-c-cpp (drv: { inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
postPatch = (drv.postPatch or "") + '' postPatch = (drv.postPatch or "") + ''
substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" "" substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
@ -1958,4 +1950,12 @@ EOT
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix; streamly-posix = doJailbreak super.streamly-posix;
distribution-nixpkgs = assert super.distribution-nixpkgs.version == "1.6.0";
overrideCabal super.distribution-nixpkgs {
version = "1.6.1";
revision = null;
sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm";
editedCabalFile = null;
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

12
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -8,7 +8,7 @@ in
with haskellLib; with haskellLib;
self: super: { self: super: ({
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12 # see: https://github.com/psibi/shell-conduit/issues/12
@ -196,6 +196,7 @@ self: super: {
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
# We are lacking pure pgrep at the moment for tests to work # We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres; tmp-postgres = dontCheck super.tmp-postgres;
@ -252,4 +253,11 @@ self: super: {
# Otherwise impure gcc is used, which is Apple's weird wrapper # Otherwise impure gcc is used, which is Apple's weird wrapper
c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ]; c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ];
} } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin
# https://github.com/fpco/unliftio/issues/87
unliftio = dontCheck super.unliftio;
# https://github.com/fpco/inline-c/issues/127
inline-c-cpp = dontCheck super.inline-c-cpp;
})

115
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix Normal file
View file

@ -0,0 +1,115 @@
{ pkgs, haskellLib }:
with haskellLib;
self: super: {
# This compiler version needs llvm 10.x.
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
# Disable GHC 9.2.x core libraries.
array = null;
base = null;
binary = null;
bytestring = null;
Cabal = null;
containers = null;
deepseq = null;
directory = null;
exceptions = null;
filepath = null;
ghc-bignum = null;
ghc-boot = null;
ghc-boot-th = null;
ghc-compact = null;
ghc-heap = null;
ghc-prim = null;
ghci = null;
haskeline = null;
hpc = null;
integer-gmp = null;
libiserv = null;
mtl = null;
parsec = null;
pretty = null;
process = null;
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
text = null;
time = null;
transformers = null;
unix = null;
xhtml = null;
# 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;
});
# Jailbreaks & Version Updates
async = doJailbreak super.async;
ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
data-fix = doJailbreak super.data-fix;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
hackage-security = doJailbreak super.hackage-security;
hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; });
hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
lukko = doJailbreak super.lukko;
parallel = doJailbreak super.parallel;
primitive = doJailbreak (dontCheck super.primitive);
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
split = doJailbreak super.split;
tar = doJailbreak super.tar;
time-compat = doJailbreak super.time-compat;
vector = doJailbreak (dontCheck super.vector);
vector-binary-instances = doJailbreak super.vector-binary-instances;
vector-th-unbox = doJailbreak super.vector-th-unbox;
zlib = doJailbreak super.zlib;
# Apply patches from head.hackage.
alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
});
doctest = dontCheck (doJailbreak super.doctest_0_18_1);
language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
});
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
memory = super.memory_0_16_0;
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
# https://github.com/snoyberg/mono-traversable/issues/192
mono-traversable = dontCheck super.mono-traversable;
# Disable tests pending resolution of
# https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
}

7
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -632,7 +632,6 @@ broken-packages:
- cio - cio
- cipher-blowfish - cipher-blowfish
- circlehs - circlehs
- circular
- citeproc-hs - citeproc-hs
- cjk - cjk
- cj-token - cj-token
@ -1021,9 +1020,11 @@ broken-packages:
- dgim - dgim
- dgs - dgs
- dhall-check - dhall-check
- dhall-csv
- dhall-fly - dhall-fly
- dhall-text - dhall-text
- dhall-to-cabal - dhall-to-cabal
- dhall-toml
- dhcp-lease-parser - dhcp-lease-parser
- dhrun - dhrun
- dia-base - dia-base
@ -2535,6 +2536,7 @@ broken-packages:
- IsNull - IsNull
- iso8601-duration - iso8601-duration
- isobmff - isobmff
- isocline
- isotope - isotope
- itcli - itcli
- itemfield - itemfield
@ -3194,7 +3196,6 @@ broken-packages:
- nanomsg-haskell - nanomsg-haskell
- nanoparsec - nanoparsec
- NanoProlog - NanoProlog
- nanovg
- nanq - nanq
- naperian - naperian
- naqsha - naqsha
@ -4802,6 +4803,7 @@ broken-packages:
- th-traced - th-traced
- thumbnail-plus - thumbnail-plus
- tianbar - tianbar
- ticket-management
- TicTacToe - TicTacToe
- tictactoe3d - tictactoe3d
- tidal-midi - tidal-midi
@ -5329,6 +5331,7 @@ broken-packages:
- yandex-translate - yandex-translate
- yaop - yaop
- yap - yap
- yapb
- yarr - yarr
- yaya-test - yaya-test
- yaya-unsafe-test - yaya-unsafe-test

221
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -63,10 +63,9 @@ core-packages:
# available on Hackage, `hackage2nix` would generate two packages, `aeson` # available on Hackage, `hackage2nix` would generate two packages, `aeson`
# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0. # at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0.
# #
# WARNING: This list is generated semiautomatically based on the most recent # WARNING: We import a list of default-package-overrides from stackage which is
# LTS package set. If you want to add entries to it, you must do so before the # tracked in stackage.yaml. Adding conflicting overrides with stackage here will
# comment saying "# LTS Haskell x.y". Any changes after that comment will be # not work.
# lost the next time `update-stackage.sh` runs.
default-package-overrides: default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
- MissingH ==1.4.2.0 - MissingH ==1.4.2.0
@ -91,6 +90,8 @@ default-package-overrides:
- streamly-bytestring < 0.1.3 - streamly-bytestring < 0.1.3
- streamly-lmdb < 0.3.0 - streamly-lmdb < 0.3.0
- streamly-process - streamly-process
# dhall-nix is not part of stackage, remove if dhall >= 1.40
- dhall-nix < 1.1.22
extra-packages: extra-packages:
- base16-bytestring < 1 # required for cabal-install etc. - base16-bytestring < 1 # required for cabal-install etc.
@ -337,130 +338,130 @@ package-maintainers:
- nix-tree - nix-tree
unsupported-platforms: unsupported-platforms:
Allure: [ x86_64-darwin ] Allure: [ x86_64-darwin, aarch64-darwin ]
alsa-mixer: [ x86_64-darwin ] alsa-mixer: [ x86_64-darwin, aarch64-darwin ]
alsa-pcm: [ x86_64-darwin ] alsa-pcm: [ x86_64-darwin, aarch64-darwin ]
alsa-seq: [ x86_64-darwin ] alsa-seq: [ x86_64-darwin, aarch64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bdcs-api: [ x86_64-darwin ] bdcs-api: [ x86_64-darwin, aarch64-darwin ]
bindings-directfb: [ x86_64-darwin ] bindings-directfb: [ x86_64-darwin, aarch64-darwin ]
bindings-parport: [ x86_64-darwin ] # parport is a linux kernel component bindings-parport: [ x86_64-darwin, aarch64-darwin ] # parport is a linux kernel component
bindings-sane: [ x86_64-darwin ] bindings-sane: [ x86_64-darwin, aarch64-darwin ]
btrfs: [ x86_64-darwin ] # depends on linux btrfs: [ x86_64-darwin, aarch64-darwin ] # depends on linux
bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r bustle: [ x86_64-darwin, aarch64-darwin ] # uses glibc-specific ptsname_r
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 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 crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
cut-the-crap: [ x86_64-darwin ] cut-the-crap: [ x86_64-darwin, aarch64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Euterpea: [ x86_64-darwin ] Euterpea: [ x86_64-darwin, aarch64-darwin ]
follow-file: [ x86_64-darwin ] follow-file: [ x86_64-darwin, aarch64-darwin ]
freenect: [ x86_64-darwin ] freenect: [ x86_64-darwin, aarch64-darwin ]
FTGL: [ x86_64-darwin ] FTGL: [ x86_64-darwin, aarch64-darwin ]
fuzzytime: [ x86_64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 fuzzytime: [ x86_64-darwin, aarch64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin ] ghcjs-dom-hello: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin ] gi-dbusmenugtk3: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenu: [ x86_64-darwin ] gi-dbusmenu: [ x86_64-darwin, aarch64-darwin ]
gi-ggit: [ x86_64-darwin ] gi-ggit: [ x86_64-darwin, aarch64-darwin ]
gi-ibus: [ x86_64-darwin ] gi-ibus: [ x86_64-darwin, aarch64-darwin ]
gi-ostree: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin, aarch64-darwin ]
gi-vte: [ x86_64-darwin ] gi-vte: [ x86_64-darwin, aarch64-darwin ]
gi-wnck: [ x86_64-darwin ] gi-wnck: [ x86_64-darwin, aarch64-darwin ]
gnome-keyring: [ x86_64-darwin ] gnome-keyring: [ x86_64-darwin, aarch64-darwin ]
gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
gtk-sni-tray: [ x86_64-darwin ] gtk-sni-tray: [ x86_64-darwin, aarch64-darwin ]
haskell-snake: [ x86_64-darwin ] haskell-snake: [ x86_64-darwin, aarch64-darwin ]
hcwiid: [ x86_64-darwin ] hcwiid: [ x86_64-darwin, aarch64-darwin ]
hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
HFuse: [ x86_64-darwin ] HFuse: [ x86_64-darwin, aarch64-darwin ]
hidapi: [ x86_64-darwin ] hidapi: [ x86_64-darwin, aarch64-darwin ]
hinotify-bytestring: [ x86_64-darwin ] hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
honk: [ x86_64-darwin ] honk: [ x86_64-darwin, aarch64-darwin ]
hpapi: [ x86_64-darwin ] hpapi: [ x86_64-darwin, aarch64-darwin ]
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
HSoM: [ x86_64-darwin ] HSoM: [ x86_64-darwin, aarch64-darwin ]
iwlib: [ x86_64-darwin ] iwlib: [ x86_64-darwin, aarch64-darwin ]
jsaddle-webkit2gtk: [ x86_64-darwin ] jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ]
kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API
LambdaHack: [ x86_64-darwin ] LambdaHack: [ x86_64-darwin, aarch64-darwin ]
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
libmodbus: [ x86_64-darwin ] libmodbus: [ x86_64-darwin, aarch64-darwin ]
libsystemd-journal: [ x86_64-darwin ] libsystemd-journal: [ x86_64-darwin, aarch64-darwin ]
libtelnet: [ x86_64-darwin ] libtelnet: [ x86_64-darwin, aarch64-darwin ]
libzfs: [ x86_64-darwin ] libzfs: [ x86_64-darwin, aarch64-darwin ]
linearEqSolver: [ aarch64-linux ] linearEqSolver: [ aarch64-linux ]
linux-evdev: [ x86_64-darwin ] linux-evdev: [ x86_64-darwin, aarch64-darwin ]
linux-file-extents: [ x86_64-darwin ] linux-file-extents: [ x86_64-darwin, aarch64-darwin ]
linux-inotify: [ x86_64-darwin ] linux-inotify: [ x86_64-darwin, aarch64-darwin ]
linux-mount: [ x86_64-darwin ] linux-mount: [ x86_64-darwin, aarch64-darwin ]
linux-namespaces: [ x86_64-darwin ] linux-namespaces: [ x86_64-darwin, aarch64-darwin ]
lio-fs: [ x86_64-darwin ] lio-fs: [ x86_64-darwin, aarch64-darwin ]
logging-facade-journald: [ x86_64-darwin ] logging-facade-journald: [ x86_64-darwin, aarch64-darwin ]
midi-alsa: [ x86_64-darwin ] midi-alsa: [ x86_64-darwin, aarch64-darwin ]
mpi-hs: [ aarch64-linux, x86_64-darwin ] mpi-hs: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-binary: [ aarch64-linux, x86_64-darwin ] mpi-hs-binary: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ] mpi-hs-cereal: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin ] mpi-hs-store: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mplayer-spot: [ aarch64-linux ] mplayer-spot: [ aarch64-linux ]
mptcp-pm: [ x86_64-darwin ] mptcp-pm: [ x86_64-darwin, aarch64-darwin ]
netlink: [ x86_64-darwin ] netlink: [ x86_64-darwin, aarch64-darwin ]
notifications-tray-icon: [ x86_64-darwin ] # depends on gi-dbusmenu notifications-tray-icon: [ x86_64-darwin, aarch64-darwin ] # depends on gi-dbusmenu
oculus: [ x86_64-darwin ] oculus: [ x86_64-darwin, aarch64-darwin ]
pam: [ x86_64-darwin ] pam: [ x86_64-darwin, aarch64-darwin ]
parport: [ x86_64-darwin ] parport: [ x86_64-darwin, aarch64-darwin ]
password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128
piyo: [ x86_64-darwin ] piyo: [ x86_64-darwin, aarch64-darwin ]
PortMidi-simple: [ x86_64-darwin ] PortMidi-simple: [ x86_64-darwin, aarch64-darwin ]
PortMidi: [ x86_64-darwin ] PortMidi: [ x86_64-darwin, aarch64-darwin ]
posix-api: [ x86_64-darwin ] posix-api: [ x86_64-darwin, aarch64-darwin ]
Raincat: [ x86_64-darwin ] Raincat: [ x86_64-darwin, aarch64-darwin ]
reactive-balsa: [ x86_64-darwin ] # depends on alsa-core reactive-balsa: [ x86_64-darwin, aarch64-darwin ] # depends on alsa-core
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ] reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-dom: [ x86_64-darwin, aarch64-linux ] reflex-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-localize-dom: [ x86_64-darwin, aarch64-linux ] reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
rtlsdr: [ x86_64-darwin ] rtlsdr: [ x86_64-darwin, aarch64-darwin ]
rubberband: [ x86_64-darwin ] rubberband: [ x86_64-darwin, aarch64-darwin ]
sbv: [ aarch64-linux ] sbv: [ aarch64-linux ]
scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86 scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8 scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
sdl2-mixer: [ x86_64-darwin ] sdl2-mixer: [ x86_64-darwin, aarch64-darwin ]
sdl2-ttf: [ x86_64-darwin ] sdl2-ttf: [ x86_64-darwin, aarch64-darwin ]
synthesizer-alsa: [ x86_64-darwin ] synthesizer-alsa: [ x86_64-darwin, aarch64-darwin ]
taffybar: [ x86_64-darwin ] taffybar: [ x86_64-darwin, aarch64-darwin ]
termonad: [ x86_64-darwin ] termonad: [ x86_64-darwin, aarch64-darwin ]
tokyotyrant-haskell: [ x86_64-darwin ] tokyotyrant-haskell: [ x86_64-darwin, aarch64-darwin ]
udev: [ x86_64-darwin ] udev: [ x86_64-darwin, aarch64-darwin ]
Unixutils-shadow: [ x86_64-darwin ] Unixutils-shadow: [ x86_64-darwin, aarch64-darwin ]
verifiable-expressions: [ aarch64-linux ] verifiable-expressions: [ aarch64-linux ]
vrpn: [ x86_64-darwin ] vrpn: [ x86_64-darwin, aarch64-darwin ]
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ] vulkan: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ] VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
vulkan-utils: [ x86_64-darwin ] vulkan-utils: [ x86_64-darwin, aarch64-darwin ]
webkit2gtk3-javascriptcore: [ x86_64-darwin ] webkit2gtk3-javascriptcore: [ x86_64-darwin, aarch64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin ] xattr: [ x86_64-darwin, aarch64-darwin ]
xgboost-haskell: [ aarch64-linux, armv7l-linux ] xgboost-haskell: [ aarch64-linux, armv7l-linux ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin ] xmobar: [ x86_64-darwin, aarch64-darwin ]
xmonad-extras: [ x86_64-darwin ] xmonad-extras: [ x86_64-darwin, aarch64-darwin ]
xmonad-volume: [ x86_64-darwin ] xmonad-volume: [ x86_64-darwin, aarch64-darwin ]
dont-distribute-packages: dont-distribute-packages:
# Depends on shine, which is a ghcjs project. # Depends on shine, which is a ghcjs project.

112
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage LTS 18.5 # Stackage LTS 18.7
# This file is auto-generated by # This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh # maintainers/scripts/haskell/update-stackage.sh
default-package-overrides: default-package-overrides:
@ -11,8 +11,8 @@ default-package-overrides:
- ad ==4.4.1 - ad ==4.4.1
- adjunctions ==4.4 - adjunctions ==4.4
- adler32 ==0.1.2.0 - adler32 ==0.1.2.0
- aern2-mp ==0.2.7.0 - aern2-mp ==0.2.8.0
- aern2-real ==0.2.7.0 - aern2-real ==0.2.8.0
- aeson ==1.5.6.0 - aeson ==1.5.6.0
- aeson-attoparsec ==0.0.0 - aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0 - aeson-better-errors ==0.9.1.0
@ -145,7 +145,7 @@ default-package-overrides:
- ansi-terminal ==0.11 - ansi-terminal ==0.11
- ansi-wl-pprint ==0.6.9 - ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2 - ANum ==0.2.0.2
- apecs ==0.9.2 - apecs ==0.9.3
- apecs-gloss ==0.2.4 - apecs-gloss ==0.2.4
- apecs-physics ==0.4.5 - apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2 - api-field-json-th ==0.1.0.2
@ -269,7 +269,7 @@ default-package-overrides:
- blake2 ==0.3.0 - blake2 ==0.3.0
- blanks ==0.5.0 - blanks ==0.5.0
- blas-carray ==0.1.0.1 - blas-carray ==0.1.0.1
- blas-comfort-array ==0.0.0.2 - blas-comfort-array ==0.0.0.3
- blas-ffi ==0.1 - blas-ffi ==0.1
- blaze-bootstrap ==0.1.0.1 - blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.2.1 - blaze-builder ==0.4.2.1
@ -288,7 +288,7 @@ default-package-overrides:
- boots ==0.2.0.1 - boots ==0.2.0.1
- bordacount ==0.1.0.0 - bordacount ==0.1.0.0
- boring ==0.2 - boring ==0.2
- both ==0.1.1.1 - both ==0.1.1.2
- bound ==2.0.3 - bound ==2.0.3
- BoundedChan ==1.0.3.0 - BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0 - bounded-queue ==1.0.0
@ -311,7 +311,7 @@ default-package-overrides:
- bv ==0.5 - bv ==0.5
- bv-little ==1.1.1 - bv-little ==1.1.1
- byteable ==0.1.1 - byteable ==0.1.1
- byte-count-reader ==0.10.1.3 - byte-count-reader ==0.10.1.5
- bytedump ==1.0 - bytedump ==1.0
- byte-order ==0.1.2.0 - byte-order ==0.1.2.0
- byteorder ==1.0.4 - byteorder ==1.0.4
@ -331,13 +331,15 @@ default-package-overrides:
- c2hs ==0.28.8 - c2hs ==0.28.8
- cabal2spec ==2.6.2 - cabal2spec ==2.6.2
- cabal-appimage ==0.3.0.2 - cabal-appimage ==0.3.0.2
- cabal-clean ==0.1.20210815
- cabal-debian ==5.1 - cabal-debian ==5.1
- cabal-doctest ==1.0.8 - cabal-doctest ==1.0.8
- cabal-file ==0.1.1 - cabal-file ==0.1.1
- cabal-flatpak ==0.1.0.2 - cabal-flatpak ==0.1.0.2
- cabal-plan ==0.7.2.0 - cabal-plan ==0.7.2.0
- cabal-rpm ==2.0.9 - cabal-rpm ==2.0.10
- cache ==0.1.3.0 - cache ==0.1.3.0
- cached-json-file ==0.1.0
- cacophony ==0.10.1 - cacophony ==0.10.1
- calendar-recycling ==0.0.0.1 - calendar-recycling ==0.0.0.1
- call-stack ==0.3.0 - call-stack ==0.3.0
@ -381,7 +383,7 @@ default-package-overrides:
- cheapskate-lucid ==0.1.0.0 - cheapskate-lucid ==0.1.0.0
- checkers ==0.5.6 - checkers ==0.5.6
- checksum ==0.0 - checksum ==0.0
- chimera ==0.3.1.0 - chimera ==0.3.2.0
- chiphunk ==0.1.4.0 - chiphunk ==0.1.4.0
- choice ==0.2.2 - choice ==0.2.2
- chronologique ==0.3.1.3 - chronologique ==0.3.1.3
@ -395,9 +397,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6 - circle-packing ==0.1.0.6
- circular ==0.4.0.0 - circular ==0.4.0.0
- citeproc ==0.4.0.1 - citeproc ==0.4.0.1
- clash-ghc ==1.4.2 - clash-ghc ==1.4.3
- clash-lib ==1.4.2 - clash-lib ==1.4.3
- clash-prelude ==1.4.2 - clash-prelude ==1.4.3
- classy-prelude ==1.5.0 - classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0 - classy-prelude-conduit ==1.5.0
- clay ==0.13.3 - clay ==0.13.3
@ -415,7 +417,7 @@ default-package-overrides:
- codec-beam ==0.2.0 - codec-beam ==0.2.0
- code-page ==0.2.1 - code-page ==0.2.1
- collect-errors ==0.1.5.0 - collect-errors ==0.1.5.0
- co-log-concurrent ==0.5.0.0 - co-log-concurrent ==0.5.1.0
- co-log-core ==0.2.1.1 - co-log-core ==0.2.1.1
- Color ==0.3.2 - Color ==0.3.2
- colorful-monoids ==0.2.1.3 - colorful-monoids ==0.2.1.3
@ -439,7 +441,7 @@ default-package-overrides:
- composition ==1.0.2.2 - composition ==1.0.2.2
- composition-extra ==2.0.0 - composition-extra ==2.0.0
- concise ==0.1.0.1 - concise ==0.1.0.1
- concurrency ==1.11.0.1 - concurrency ==1.11.0.2
- concurrent-extra ==0.7.0.12 - concurrent-extra ==0.7.0.12
- concurrent-output ==1.10.12 - concurrent-output ==1.10.12
- concurrent-split ==0.0.1.1 - concurrent-split ==0.0.1.1
@ -579,7 +581,7 @@ default-package-overrides:
- deepseq-generics ==0.2.0.0 - deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1 - deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.17 - deferred-folds ==0.9.17
- dejafu ==2.4.0.2 - dejafu ==2.4.0.3
- dense-linear-algebra ==0.1.0.0 - dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0 - dependent-map ==0.4.0.0
- dependent-sum ==0.7.1.0 - dependent-sum ==0.7.1.0
@ -743,7 +745,7 @@ default-package-overrides:
- fakefs ==0.3.0.2 - fakefs ==0.3.0.2
- fakepull ==0.3.0.2 - fakepull ==0.3.0.2
- faktory ==1.0.3.1 - faktory ==1.0.3.1
- fast-digits ==0.3.0.0 - fast-digits ==0.3.1.0
- fast-logger ==3.0.5 - fast-logger ==3.0.5
- fast-math ==1.0.2 - fast-math ==1.0.2
- fb ==2.1.1 - fb ==2.1.1
@ -759,7 +761,7 @@ default-package-overrides:
- file-embed-lzma ==0 - file-embed-lzma ==0
- filelock ==0.1.1.5 - filelock ==0.1.1.5
- filemanip ==0.3.6.3 - filemanip ==0.3.6.3
- filepath-bytestring ==1.4.2.1.7 - filepath-bytestring ==1.4.2.1.8
- file-path-th ==0.1.0.0 - file-path-th ==0.1.0.0
- filepattern ==0.1.2 - filepattern ==0.1.2
- fileplow ==0.1.0.0 - fileplow ==0.1.0.0
@ -890,9 +892,9 @@ default-package-overrides:
- ghcid ==0.8.7 - ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0 - ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2 - ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.5.20210606 - ghc-lib ==8.10.6.20210814
- ghc-lib-parser ==8.10.5.20210606 - ghc-lib-parser ==8.10.6.20210814
- ghc-lib-parser-ex ==8.10.0.21 - ghc-lib-parser-ex ==8.10.0.22
- ghc-parser ==0.2.3.0 - ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12 - ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.9 - ghc-prof ==1.4.1.9
@ -985,7 +987,7 @@ default-package-overrides:
- hashing ==0.1.0.1 - hashing ==0.1.0.1
- hashmap ==1.3.3 - hashmap ==1.3.3
- hashtables ==1.2.4.1 - hashtables ==1.2.4.1
- haskeline ==0.8.1.2 - haskeline ==0.8.2
- haskell-awk ==1.2.0.1 - haskell-awk ==1.2.0.1
- haskell-gi ==0.25.0 - haskell-gi ==0.25.0
- haskell-gi-base ==0.25.0 - haskell-gi-base ==0.25.0
@ -1081,7 +1083,7 @@ default-package-overrides:
- hourglass-orphans ==0.1.0.0 - hourglass-orphans ==0.1.0.0
- hp2pretty ==0.10 - hp2pretty ==0.10
- hpack ==0.34.4 - hpack ==0.34.4
- hpack-dhall ==0.5.2 - hpack-dhall ==0.5.3
- hpc-codecov ==0.3.0.0 - hpc-codecov ==0.3.0.0
- hpc-lcov ==1.0.1 - hpc-lcov ==1.0.1
- hprotoc ==2.4.17 - hprotoc ==2.4.17
@ -1134,7 +1136,7 @@ default-package-overrides:
- hs-php-session ==0.0.9.3 - hs-php-session ==0.0.9.3
- hsshellscript ==3.5.0 - hsshellscript ==3.5.0
- hs-tags ==0.1.5 - hs-tags ==0.1.5
- HStringTemplate ==0.8.7 - HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.22 - HSvm ==0.1.1.3.22
- HsYAML ==0.2.1.0 - HsYAML ==0.2.1.0
- HsYAML-aeson ==0.2.0.0 - HsYAML-aeson ==0.2.0.0
@ -1142,7 +1144,7 @@ default-package-overrides:
- htaglib ==1.2.0 - htaglib ==1.2.0
- HTF ==0.14.0.6 - HTF ==0.14.0.6
- html ==1.0.1.2 - html ==1.0.1.2
- html-conduit ==1.3.2.1 - html-conduit ==1.3.2.2
- html-entities ==1.1.4.5 - html-entities ==1.1.4.5
- html-entity-map ==0.1.0.0 - html-entity-map ==0.1.0.0
- htoml ==1.0.0.3 - htoml ==1.0.0.3
@ -1168,7 +1170,7 @@ default-package-overrides:
- human-readable-duration ==0.2.1.4 - human-readable-duration ==0.2.1.4
- HUnit ==1.6.2.0 - HUnit ==1.6.2.0
- HUnit-approx ==1.1.1.1 - HUnit-approx ==1.1.1.1
- hunit-dejafu ==2.0.0.4 - hunit-dejafu ==2.0.0.5
- hvect ==0.4.0.0 - hvect ==0.4.0.0
- hvega ==0.11.0.1 - hvega ==0.11.0.1
- hw-balancedparens ==0.4.1.1 - hw-balancedparens ==0.4.1.1
@ -1255,7 +1257,7 @@ default-package-overrides:
- intern ==0.9.4 - intern ==0.9.4
- interpolate ==0.2.1 - interpolate ==0.2.1
- interpolatedstring-perl6 ==1.0.2 - interpolatedstring-perl6 ==1.0.2
- interpolation ==0.1.1.1 - interpolation ==0.1.1.2
- interpolator ==1.1.0.2 - interpolator ==1.1.0.2
- IntervalMap ==0.6.1.2 - IntervalMap ==0.6.1.2
- intervals ==0.9.2 - intervals ==0.9.2
@ -1278,9 +1280,9 @@ default-package-overrides:
- ipynb ==0.1.0.1 - ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1 - ipython-kernel ==0.10.2.1
- irc ==0.6.1.0 - irc ==0.6.1.0
- irc-client ==1.1.2.1 - irc-client ==1.1.2.2
- irc-conduit ==0.3.0.4 - irc-conduit ==0.3.0.5
- irc-ctcp ==0.1.3.0 - irc-ctcp ==0.1.3.1
- isbn ==1.1.0.2 - isbn ==1.1.0.2
- islink ==0.1.0.0 - islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8 - iso3166-country-codes ==0.20140203.8
@ -1294,6 +1296,7 @@ default-package-overrides:
- ix-shapable ==0.1.0 - ix-shapable ==0.1.0
- jack ==0.7.2 - jack ==0.7.2
- jalaali ==1.0.0.0 - jalaali ==1.0.0.0
- java-adt ==0.2018.11.4
- jira-wiki-markup ==1.4.0 - jira-wiki-markup ==1.4.0
- jose ==0.8.4 - jose ==0.8.4
- jose-jwt ==0.9.2 - jose-jwt ==0.9.2
@ -1335,14 +1338,14 @@ default-package-overrides:
- l10n ==0.1.0.1 - l10n ==0.1.0.1
- labels ==0.3.3 - labels ==0.3.3
- lackey ==1.0.15 - lackey ==1.0.15
- lambdabot-core ==5.3.0.1 - lambdabot-core ==5.3.0.2
- LambdaHack ==0.10.2.0 - LambdaHack ==0.10.2.0
- lame ==0.2.0 - lame ==0.2.0
- language-avro ==0.1.3.1 - language-avro ==0.1.3.1
- language-bash ==0.9.2 - language-bash ==0.9.2
- language-c ==0.9.0.1 - language-c ==0.9.0.1
- language-c-quote ==0.13 - language-c-quote ==0.13
- language-docker ==10.0.1 - language-docker ==10.0.2
- language-java ==0.2.9 - language-java ==0.2.9
- language-javascript ==0.7.1.0 - language-javascript ==0.7.1.0
- language-protobuf ==1.0.1 - language-protobuf ==1.0.1
@ -1350,7 +1353,7 @@ default-package-overrides:
- language-thrift ==0.12.0.0 - language-thrift ==0.12.0.0
- lapack ==0.3.2 - lapack ==0.3.2
- lapack-carray ==0.0.3 - lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1 - lapack-comfort-array ==0.0.1
- lapack-ffi ==0.0.3 - lapack-ffi ==0.0.3
- lapack-ffi-tools ==0.1.2.1 - lapack-ffi-tools ==0.1.2.1
- largeword ==1.2.5 - largeword ==1.2.5
@ -1510,7 +1513,7 @@ default-package-overrides:
- min-max-pqueue ==0.1.0.2 - min-max-pqueue ==0.1.0.2
- mintty ==0.1.2 - mintty ==0.1.2
- missing-foreign ==0.1.1 - missing-foreign ==0.1.1
- mixed-types-num ==0.5.8.0 - mixed-types-num ==0.5.9.1
- mltool ==0.2.0.1 - mltool ==0.2.0.1
- mmap ==0.5.9 - mmap ==0.5.9
- mmark ==0.0.7.2 - mmark ==0.0.7.2
@ -1526,9 +1529,9 @@ default-package-overrides:
- modern-uri ==0.3.4.1 - modern-uri ==0.3.4.1
- modular ==0.1.0.8 - modular ==0.1.0.8
- monad-chronicle ==1.0.0.1 - monad-chronicle ==1.0.0.1
- monad-control ==1.0.3 - monad-control ==1.0.3.1
- monad-control-aligned ==0.0.1.1 - monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.1.2 - monad-coroutine ==0.9.1.3
- monad-extras ==0.6.0 - monad-extras ==0.6.0
- monadic-arrays ==0.2.2 - monadic-arrays ==0.2.2
- monad-journal ==0.8.1 - monad-journal ==0.8.1
@ -1541,7 +1544,7 @@ default-package-overrides:
- monad-memo ==0.5.3 - monad-memo ==0.5.3
- monad-metrics ==0.2.2.0 - monad-metrics ==0.2.2.0
- monad-par ==0.3.5 - monad-par ==0.3.5
- monad-parallel ==0.7.2.4 - monad-parallel ==0.7.2.5
- monad-par-extras ==0.3.3 - monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2 - monad-peel ==0.2.1.2
- monad-primitive ==0.1 - monad-primitive ==0.1
@ -1586,7 +1589,7 @@ default-package-overrides:
- mustache ==2.3.1 - mustache ==2.3.1
- mutable-containers ==0.3.4 - mutable-containers ==0.3.4
- mwc-probability ==2.3.1 - mwc-probability ==2.3.1
- mwc-random ==0.15.0.1 - mwc-random ==0.15.0.2
- mwc-random-monad ==0.7.3.1 - mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0 - mx-state-codes ==1.0.0.0
- mysql ==0.2.0.1 - mysql ==0.2.0.1
@ -1604,7 +1607,7 @@ default-package-overrides:
- neat-interpolation ==0.5.1.2 - neat-interpolation ==0.5.1.2
- netcode-io ==0.0.2 - netcode-io ==0.0.2
- netlib-carray ==0.1 - netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1 - netlib-comfort-array ==0.0.0.2
- netlib-ffi ==0.1.1 - netlib-ffi ==0.1.1
- net-mqtt ==0.7.1.1 - net-mqtt ==0.7.1.1
- net-mqtt-lens ==0.1.1.0 - net-mqtt-lens ==0.1.1.0
@ -1674,7 +1677,7 @@ default-package-overrides:
- OneTuple ==0.2.2.1 - OneTuple ==0.2.2.1
- Only ==0.1 - Only ==0.1
- oo-prototypes ==0.1.0.0 - oo-prototypes ==0.1.0.0
- opaleye ==0.7.3.0 - opaleye ==0.7.4.0
- OpenAL ==1.7.0.5 - OpenAL ==1.7.0.5
- openapi3 ==3.1.0 - openapi3 ==3.1.0
- open-browser ==0.2.1.0 - open-browser ==0.2.1.0
@ -1803,6 +1806,7 @@ default-package-overrides:
- pointedlist ==0.6.1 - pointedlist ==0.6.1
- pointless-fun ==1.1.0.6 - pointless-fun ==1.1.0.6
- poll ==0.0.0.2 - poll ==0.0.0.2
- polling-cache ==0.1.1.0
- poly ==0.5.0.0 - poly ==0.5.0.0
- poly-arity ==0.1.0 - poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2 - polynomials-bernstein ==1.1.2
@ -1844,7 +1848,7 @@ default-package-overrides:
- pretty-sop ==0.2.0.3 - pretty-sop ==0.2.0.3
- pretty-terminal ==0.1.0.0 - pretty-terminal ==0.1.0.0
- primes ==0.2.1.0 - primes ==0.2.1.0
- primitive ==0.7.1.0 - primitive ==0.7.2.0
- primitive-addr ==0.1.0.2 - primitive-addr ==0.1.0.2
- primitive-extras ==0.10.1 - primitive-extras ==0.10.1
- primitive-unaligned ==0.1.1.1 - primitive-unaligned ==0.1.1.1
@ -1971,6 +1975,7 @@ default-package-overrides:
- regex-pcre ==0.95.0.0 - regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43 - regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.1 - regex-posix ==0.96.0.1
- regex-posix-clib ==2.7
- regex-tdfa ==1.3.1.1 - regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0 - regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3 - registry ==0.2.0.3
@ -1983,17 +1988,17 @@ default-package-overrides:
- reliable-io ==0.0.1 - reliable-io ==0.0.1
- relude ==0.7.0.0 - relude ==0.7.0.0
- renderable ==0.2.0.1 - renderable ==0.2.0.1
- replace-attoparsec ==1.4.4.0 - replace-attoparsec ==1.4.5.0
- replace-megaparsec ==1.4.4.0 - replace-megaparsec ==1.4.4.0
- repline ==0.4.0.0 - repline ==0.4.0.0
- req ==3.9.0 - req ==3.9.0
- req-conduit ==1.0.0 - req-conduit ==1.0.1
- rerebase ==1.13.0.1 - rerebase ==1.13.0.1
- rescue ==0.4.2.1 - rescue ==0.4.2.1
- resistor-cube ==0.0.1.2 - resistor-cube ==0.0.1.2
- resolv ==0.1.2.0 - resolv ==0.1.2.0
- resource-pool ==0.2.3.2 - resource-pool ==0.2.3.2
- resourcet ==1.2.4.2 - resourcet ==1.2.4.3
- result ==0.2.6.0 - result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25 - rethinkdb-client-driver ==0.0.25
- retry ==0.8.1.2 - retry ==0.8.1.2
@ -2004,7 +2009,7 @@ default-package-overrides:
- rhine ==0.7.0 - rhine ==0.7.0
- rhine-gloss ==0.7.0 - rhine-gloss ==0.7.0
- rigel-viz ==0.2.0.0 - rigel-viz ==0.2.0.0
- rio ==0.1.20.0 - rio ==0.1.21.0
- rio-orphans ==0.1.2.0 - rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0 - rio-prettyprint ==0.1.1.0
- roc-id ==0.1.0.0 - roc-id ==0.1.0.0
@ -2158,6 +2163,7 @@ default-package-overrides:
- singletons ==2.7 - singletons ==2.7
- singletons-presburger ==0.6.0.0 - singletons-presburger ==0.6.0.0
- siphash ==1.0.3 - siphash ==1.0.3
- Sit ==0.2021.1.18
- sitemap-gen ==0.1.0.0 - sitemap-gen ==0.1.0.0
- sized ==1.0.0.0 - sized ==1.0.0.0
- skein ==1.0.9.4 - skein ==1.0.9.4
@ -2239,7 +2245,7 @@ default-package-overrides:
- storable-record ==0.0.5 - storable-record ==0.0.5
- storable-tuple ==0.0.3.3 - storable-tuple ==0.0.3.3
- storablevector ==0.2.13.1 - storablevector ==0.2.13.1
- store ==0.7.11 - store ==0.7.12
- store-core ==0.4.4.4 - store-core ==0.4.4.4
- store-streaming ==0.2.0.3 - store-streaming ==0.2.0.3
- stratosphere ==0.59.1 - stratosphere ==0.59.1
@ -2315,7 +2321,7 @@ default-package-overrides:
- tasty ==1.4.1 - tasty ==1.4.1
- tasty-ant-xml ==1.1.8 - tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.5 - tasty-bench ==0.2.5
- tasty-dejafu ==2.0.0.7 - tasty-dejafu ==2.0.0.8
- tasty-discover ==4.2.2 - tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3 - tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1 - tasty-focus ==1.0.1
@ -2356,7 +2362,7 @@ default-package-overrides:
- test-framework-smallcheck ==0.2 - test-framework-smallcheck ==0.2
- test-fun ==0.1.0.0 - test-fun ==0.1.0.0
- testing-type-modifiers ==0.1.0.1 - testing-type-modifiers ==0.1.0.1
- texmath ==0.12.3 - texmath ==0.12.3.1
- text-ansi ==0.1.1 - text-ansi ==0.1.1
- text-binary ==0.2.1.1 - text-binary ==0.2.1.1
- text-builder ==0.6.6.2 - text-builder ==0.6.6.2
@ -2427,7 +2433,7 @@ default-package-overrides:
- timezone-series ==0.1.9 - timezone-series ==0.1.9
- tinylog ==0.15.0 - tinylog ==0.15.0
- titlecase ==1.0.1 - titlecase ==1.0.1
- tldr ==0.9.0 - tldr ==0.9.1
- tls ==1.5.5 - tls ==1.5.5
- tls-debug ==0.4.8 - tls-debug ==0.4.8
- tls-session-manager ==0.0.4 - tls-session-manager ==0.0.4
@ -2441,7 +2447,7 @@ default-package-overrides:
- torsor ==0.1 - torsor ==0.1
- tostring ==0.2.1.1 - tostring ==0.2.1.1
- transaction ==0.1.1.3 - transaction ==0.1.1.3
- transformers-base ==0.4.5.2 - transformers-base ==0.4.6
- transformers-bifunctors ==0.1 - transformers-bifunctors ==0.1
- transformers-compat ==0.6.6 - transformers-compat ==0.6.6
- transformers-fix ==1.0 - transformers-fix ==1.0
@ -2463,11 +2469,11 @@ default-package-overrides:
- turtle ==1.5.22 - turtle ==1.5.22
- typecheck-plugin-nat-simple ==0.1.0.2 - typecheck-plugin-nat-simple ==0.1.0.2
- TypeCompose ==0.9.14 - TypeCompose ==0.9.14
- typed-process ==0.2.6.0 - typed-process ==0.2.6.1
- typed-uuid ==0.1.0.0 - typed-uuid ==0.1.0.0
- type-equality ==1 - type-equality ==1
- type-errors ==0.2.0.0 - type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.1 - type-errors-pretty ==0.0.1.2
- type-hint ==0.1 - type-hint ==0.1
- type-level-integers ==0.0.1 - type-level-integers ==0.0.1
- type-level-kv-list ==1.1.0 - type-level-kv-list ==1.1.0
@ -2593,7 +2599,7 @@ default-package-overrides:
- wai-feature-flags ==0.1.0.1 - wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1 - wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6 - wai-logger ==2.3.6
- wai-middleware-auth ==0.2.5.0 - wai-middleware-auth ==0.2.5.1
- wai-middleware-caching ==0.1.0.2 - wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1 - wai-middleware-clacks ==0.1.0.1
- wai-middleware-prometheus ==1.0.0 - wai-middleware-prometheus ==1.0.0
@ -2649,7 +2655,7 @@ default-package-overrides:
- writer-cps-transformers ==0.5.6.1 - writer-cps-transformers ==0.5.6.1
- wss-client ==0.3.0.0 - wss-client ==0.3.0.0
- wuss ==1.1.18 - wuss ==1.1.18
- X11 ==1.10 - X11 ==1.10.1
- X11-xft ==0.3.1 - X11-xft ==0.3.1
- x11-xim ==0.0.9.0 - x11-xim ==0.0.9.0
- x509 ==1.7.5 - x509 ==1.7.5

16
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -391,7 +391,6 @@ dont-distribute-packages:
- adict - adict
- adp-multi-monadiccp - adp-multi-monadiccp
- aern2-real - aern2-real
- aern2-real_0_2_8_0
- aeson-native - aeson-native
- afv - afv
- agda-server - agda-server
@ -712,14 +711,14 @@ dont-distribute-packages:
- claferwiki - claferwiki
- clash - clash
- clash-ghc - clash-ghc
- clash-ghc_1_4_3
- clash-lib - clash-lib
- clash-lib_1_4_3
- clash-multisignal - clash-multisignal
- clash-prelude-quickcheck - clash-prelude-quickcheck
- clash-shake
- clash-systemverilog - clash-systemverilog
- clash-verilog - clash-verilog
- clash-vhdl - clash-vhdl
- clashilator
- classify-frog - classify-frog
- classy-miso - classy-miso
- clckwrks - clckwrks
@ -1063,7 +1062,6 @@ dont-distribute-packages:
- falling-turnip - falling-turnip
- fallingblocks - fallingblocks
- family-tree - family-tree
- fast-digits
- fastirc - fastirc
- fault-tree - fault-tree
- fbrnch - fbrnch
@ -1131,6 +1129,7 @@ dont-distribute-packages:
- fplll - fplll
- fpnla-examples - fpnla-examples
- frame-markdown - frame-markdown
- freckle-app
- free-theorems-counterexamples - free-theorems-counterexamples
- free-theorems-seq - free-theorems-seq
- free-theorems-seq-webui - free-theorems-seq-webui
@ -1855,7 +1854,6 @@ dont-distribute-packages:
- knots - knots
- korfu - korfu
- ks-test - ks-test
- kubernetes-client
- kurita - kurita
- laborantin-hs - laborantin-hs
- labsat - labsat
@ -1895,7 +1893,6 @@ dont-distribute-packages:
- lapack - lapack
- lapack-carray - lapack-carray
- lapack-comfort-array - lapack-comfort-array
- lapack-comfort-array_0_0_1
- lapack-hmatrix - lapack-hmatrix
- lapack_0_4 - lapack_0_4
- lat - lat
@ -2006,7 +2003,6 @@ dont-distribute-packages:
- loup - loup
- ls-usb - ls-usb
- lsystem - lsystem
- lti13
- luachunk - luachunk
- lucid-colonnade - lucid-colonnade
- lucienne - lucienne
@ -2064,7 +2060,6 @@ dont-distribute-packages:
- maxent - maxent
- maxent-learner-hw-gui - maxent-learner-hw-gui
- maxsharing - maxsharing
- mcmc
- mcmc-samplers - mcmc-samplers
- mealy - mealy
- mediabus-fdk-aac - mediabus-fdk-aac
@ -2114,7 +2109,6 @@ dont-distribute-packages:
- monetdb-mapi - monetdb-mapi
- mongrel2-handler - mongrel2-handler
- monky - monky
- monomer
- monte-carlo - monte-carlo
- moo - moo
- moo-nad - moo-nad
@ -2172,7 +2166,6 @@ dont-distribute-packages:
- mywatch - mywatch
- n2o-web - n2o-web
- nakadi-client - nakadi-client
- nanovg-simple
- nats-queue - nats-queue
- natural-number - natural-number
- nemesis-titan - nemesis-titan
@ -2591,6 +2584,8 @@ dont-distribute-packages:
- restful-snap - restful-snap
- restricted-workers - restricted-workers
- rethinkdb-model - rethinkdb-model
- retroclash-lib
- retroclash-sim
- rewrite - rewrite
- rewriting - rewriting
- rezoom - rezoom
@ -3270,7 +3265,6 @@ dont-distribute-packages:
- yeshql - yeshql
- yesod-articles - yesod-articles
- yesod-auth-ldap - yesod-auth-ldap
- yesod-auth-lti13
- yesod-colonnade - yesod-colonnade
- yesod-continuations - yesod-continuations
- yesod-examples - yesod-examples

11
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -223,7 +223,11 @@ self: super: builtins.intersectAttrs super {
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
# Test suite wants to connect to $DISPLAY. # Test suite wants to connect to $DISPLAY.
bindings-GLFW = dontCheck super.bindings-GLFW;
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]); hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
monomer = dontCheck super.monomer;
# Wants to check against a real DB, Needs freetds # Wants to check against a real DB, Needs freetds
odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]); odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
@ -352,13 +356,6 @@ self: super: builtins.intersectAttrs super {
# Looks like Avahi provides the missing library # Looks like Avahi provides the missing library
dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
# requires an X11 display
bindings-GLFW = dontCheck super.bindings-GLFW;
# requires an X11 display in test suite
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
# tests depend on executable # tests depend on executable
ghcide = overrideCabal super.ghcide (drv: { ghcide = overrideCabal super.ghcide (drv: {
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';

2174
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

17
pkgs/development/libraries/fftw/default.nix
View file

@ -1,4 +1,15 @@
{ fetchurl, stdenv, lib, gfortran, llvmPackages ? null, precision ? "double", perl }: { fetchurl
, stdenv
, lib
, gfortran
, perl
, llvmPackages ? null
, precision ? "double"
, enableAvx ? stdenv.hostPlatform.avxSupport
, enableAvx2 ? stdenv.hostPlatform.avx2Support
, enableAvx512 ? stdenv.hostPlatform.avx512Support
, enableFma ? stdenv.hostPlatform.fmaSupport
}:
with lib; with lib;
@ -40,6 +51,10 @@ stdenv.mkDerivation {
# all x86_64 have sse2 # all x86_64 have sse2
# however, not all float sizes fit # however, not all float sizes fit
++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2"
++ optional enableAvx "--enable-avx"
++ optional enableAvx2 "--enable-avx2"
++ optional enableAvx512 "--enable-avx512"
++ optional enableFma "--enable-fma"
++ [ "--enable-openmp" ] ++ [ "--enable-openmp" ]
# doc generation causes Fortran wrapper generation which hard-codes gcc # doc generation causes Fortran wrapper generation which hard-codes gcc
++ optional (!withDoc) "--disable-doc"; ++ optional (!withDoc) "--disable-doc";

29
pkgs/development/libraries/kddockwidgets/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, qtx11extras
}:
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.4.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lgNRuRoJhBw0n/Hb58uxpa+4aXoOrK4bRldtIXYIKLI=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qtx11extras ];
meta = with lib; {
description = "KDAB's Dock Widget Framework for Qt";
homepage = "https://www.kdab.com/development-resources/qt-tools/kddockwidgets";
license = with licenses; [ gpl2Only gpl3Only ];
maintainers = with maintainers; [ _1000teslas ];
};
}

3
pkgs/development/libraries/libint/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
, python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake , python3, perl, gmpxx, mpfr, boost, eigen, gfortran, cmake
, enableFMA ? false, enableFortran ? true , enableFMA ? stdenv.hostPlatform.fmaSupport
, enableFortran ? true
}: }:
let let

73
pkgs/development/libraries/rustc-demangle/add-Cargo.lock.patch Normal file
View file

@ -0,0 +1,73 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..0268b3b
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,67 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "arbitrary"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "237430fd6ed3740afe94eefcc278ae21e050285be882804e0d6e8695f0c94691"
+
+[[package]]
+name = "cc"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+
+[[package]]
+name = "compiler_builtins"
+version = "0.1.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20b1438ef42c655665a8ab2c1c6d605a305f031d38d9be689ddfef41a20f3aa2"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.20"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "rustc-demangle-capi"
+version = "0.1.0"
+dependencies = [
+ "rustc-demangle",
+]
+
+[[package]]
+name = "rustc-demangle-fuzz"
+version = "0.0.0"
+dependencies = [
+ "libfuzzer-sys",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "rustc-std-workspace-core"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"

34
pkgs/development/libraries/rustc-demangle/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }:
rustPlatform.buildRustPackage rec {
pname = "rustc-demangle";
version = "0.1.20";
src = fetchFromGitHub {
owner = "alexcrichton";
repo = pname;
rev = version;
sha256 = "sha256-elxclyuLmr3N66s+pR4/6OU98k1oXI2wKVJtzWPY8FI=";
};
cargoPatches = [
# generated using `cargo generate-lockfile` since repo is missing lockfile
./add-Cargo.lock.patch
];
cargoSha256 = "sha256-1tW5TOap5MstxTXAFij3IB8TIpI+FryEX9TXlVXjRl4=";
cargoBuildFlags = "-p rustc-demangle-capi";
postInstall = ''
mkdir -p $out/lib
cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib
cp -R crates/capi/include $out
'';
meta = with lib; {
description = "Rust symbol demangling";
homepage = "https://github.com/alexcrichton/rustc-demangle";
license = with licenses; [ asl20 mit ];
# upstream supports other platforms, but maintainer can only test on linux
platforms = platforms.linux;
maintainers = with maintainers; [ _1000teslas ];
};
}

7
pkgs/development/python-modules/buildbot/default.nix
View file

@ -8,8 +8,13 @@
let let
withPlugins = plugins: buildPythonPackage { withPlugins = plugins: buildPythonPackage {
name = "${package.name}-with-plugins"; pname = "${package.pname}-with-plugins";
inherit (package) version;
dontUnpack = true; dontUnpack = true;
dontBuild = true;
doCheck = false;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;

29
pkgs/development/python-modules/protonup/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, requests, configparser }:
buildPythonPackage rec {
pname = "protonup";
version = "0.1.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0z5q0s9h51w2bqm9lkafml14g13v2dgm4nm9x06v7nxqc9msmyyy";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace "argparse" ""
'';
propagatedBuildInputs = [ requests configparser ];
doCheck = false; # protonup does not have any tests
pythonImportsCheck = [ "protonup" ];
meta = with lib; {
homepage = "https://github.com/AUNaseef/protonup";
description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE";
license = licenses.gpl3Only;
maintainers = with maintainers; [ flexagoon ];
};
}

53
pkgs/development/tools/analysis/hotspot/default.nix
View file

@ -1,18 +1,22 @@
{ lib, { lib
mkDerivation, , mkDerivation
cmake, , cmake
elfutils, , elfutils
extra-cmake-modules, , extra-cmake-modules
fetchFromGitHub, , fetchFromGitHub
kconfigwidgets, , kconfigwidgets
ki18n, , ki18n
kio, , kio
kitemmodels, , kitemmodels
kitemviews, , kitemviews
kwindowsystem, , kwindowsystem
libelf, , libelf
qtbase, , qtbase
threadweaver, , threadweaver
, qtx11extras
, zstd
, kddockwidgets
, rustc-demangle
}: }:
mkDerivation rec { mkDerivation rec {
@ -27,10 +31,12 @@ mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [ buildInputs = [
elfutils elfutils
extra-cmake-modules
kconfigwidgets kconfigwidgets
ki18n ki18n
kio kio
@ -40,6 +46,10 @@ mkDerivation rec {
libelf libelf
qtbase qtbase
threadweaver threadweaver
qtx11extras
zstd
kddockwidgets
rustc-demangle
]; ];
# hotspot checks for the presence of third party libraries' # hotspot checks for the presence of third party libraries'
@ -47,9 +57,14 @@ mkDerivation rec {
# submodules; but Nix clones them and removes .git (for reproducibility). # submodules; but Nix clones them and removes .git (for reproducibility).
# So we need to fake their existence here. # So we need to fake their existence here.
postPatch = '' postPatch = ''
mkdir -p 3rdparty/perfparser/.git mkdir -p 3rdparty/{perfparser,PrefixTickLabels}/.git
''; '';
cmakeFlags = [
"-DRUSTC_DEMANGLE_INCLUDE_DIR=${rustc-demangle}/include"
"-DRUSTC_DEMANGLE_LIBRARY=${rustc-demangle}/lib/librustc_demangle.so"
];
meta = { meta = {
description = "A GUI for Linux perf"; description = "A GUI for Linux perf";
longDescription = '' longDescription = ''
@ -58,7 +73,7 @@ mkDerivation rec {
then displays the result in a graphical way. then displays the result in a graphical way.
''; '';
homepage = "https://github.com/KDAB/hotspot"; homepage = "https://github.com/KDAB/hotspot";
license = with lib.licenses; [ gpl2 gpl3 ]; license = with lib.licenses; [ gpl2Only gpl3Only ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ nh2 ]; maintainers = with lib.maintainers; [ nh2 ];
}; };

4
pkgs/development/tools/build-managers/bear/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bear"; pname = "bear";
version = "3.0.13"; version = "3.0.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rizsotto"; owner = "rizsotto";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-oMrTH3GjxiLBKX0i3ZuV+bNqpA7PkoAQAb/08Q/uELs="; sha256 = "0qy96dyd29bjvfhi46y30hli5cvshw8am0spvcv9v43660wbczd7";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

2
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View file

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages { lib, supportedGhcVersions ? [ "884" "8107" ], stdenv, haskellPackages
, haskell }: , haskell }:
# #
# The recommended way to override this package is # The recommended way to override this package is

6
pkgs/development/tools/inferno/default.nix
View file

@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "inferno"; pname = "inferno";
version = "0.10.6"; version = "0.10.7";
# github version doesn't have a Cargo.lock # github version doesn't have a Cargo.lock
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "1pn3ask36mv8byd62xhm8bjv59k12i1s533jgb5syml64w1cnn12"; sha256 = "0bzrwa87j56sv03frl0lp6izfxsldn0692g2vpwfndhrsm0gy8z9";
}; };
cargoSha256 = "0w5w9pyv34x0iy9knr79491kb9bgbcagh6251pq72mv4pvx0axip"; cargoSha256 = "1dvk1y1afqlmmqqdm91lg2wvny5q47yfjvmjzaryk2ic1s6g17b1";
# these tests depend on a patched version of flamegraph which is included in # these tests depend on a patched version of flamegraph which is included in
# the github repository as a submodule, but absent from the crates version # the github repository as a submodule, but absent from the crates version

7
pkgs/os-specific/linux/ddcci/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ddcci-driver"; pname = "ddcci-driver";
version = "0.3.3"; version = "0.4.1";
name = "${pname}-${kernel.version}-${version}"; name = "${pname}-${kernel.version}-${version}";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "${pname}-linux"; owner = "${pname}-linux";
repo = "${pname}-linux"; repo = "${pname}-linux";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vkkja3ykjil783zjpwp0vz7jy2fp9ccazzi3afd4fjk8gldin7f"; sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg";
}; };
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Kernel module driver for DDC/CI monitors"; description = "Kernel module driver for DDC/CI monitors";
homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ bricewge ]; maintainers = with maintainers; [ bricewge ];
platforms = platforms.linux; platforms = platforms.linux;
broken = kernel.kernelOlder "5.1";
}; };
} }

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.245"; version = "4.14.246";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d"; sha256 = "0fpgig84shpas1jc0h4s3aw9brkcq1as84gjbk4bfhc48bpi4mlw";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "4.19.205"; version = "4.19.206";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m"; sha256 = "1h44lvzxd0cngj71bk8qba9dz7jlqj68ir6xjwfafglb81ppgsxp";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View file

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.282"; version = "4.4.283";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc"; sha256 = "1d9v4h4cbc4i371lhhwpxbmg88gna6xyi2ahfvv0clz60802y982";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View file

@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.9.281"; version = "4.9.282";
extraMeta.branch = "4.9"; extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6"; sha256 = "059fin4si93ya13xy831w84q496ksxidpd3kyw38918sfy4p6wk7";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.10.61"; version = "5.10.62";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2"; sha256 = "1cc6z2xzi1s69805jk4f91iarx19v0yyqvssx1f1mc0l9l1db389";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.13.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.13.13"; version = "5.13.14";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam"; sha256 = "06lbjsbr86qa8yai5gfclbfxvcqsw33kxj9b4r93hh6z1wajmx82";
}; };
} // (args.argsOverride or { })) } // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.14.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.14"; version = "5.14.1";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; sha256 = "1iq8s031fviccc4710biwl7gxqdimm3nhlvxd0m3fykvhhmcanq0";
}; };
} // (args.argsOverride or { })) } // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.4.143"; version = "5.4.144";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"; sha256 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw";
}; };
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View file

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux { stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn { , scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18268"; rev = "18298";
sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4";
} }
, ... , ...
}: }:

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View file

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.4.138-rt62"; # updated by ./update-rt.sh version = "5.4.143-rt63"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4"; sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6"; sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3";
}; };
}; in [ rt-patch ] ++ kernelPatches; }; in [ rt-patch ] ++ kernelPatches;

0
pkgs/os-specific/linux/kexectools/default.nix → pkgs/os-specific/linux/kexec-tools/default.nix
View file

6
pkgs/os-specific/linux/systemd/default.nix
View file

@ -52,8 +52,8 @@
, libselinux , libselinux
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
, libseccomp , libseccomp
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools
, kexectools , kexec-tools
, bashInteractive , bashInteractive
, libmicrohttpd , libmicrohttpd
@ -302,7 +302,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withCompression [ bzip2 lz4 xz ] ++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi ++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools ++ lib.optional withKexectools kexec-tools
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables ++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2 ++ lib.optional withPCRE2 pcre2

6
pkgs/tools/networking/corerad/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "corerad"; pname = "corerad";
version = "0.3.3"; version = "0.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mdlayher"; owner = "mdlayher";
repo = "corerad"; repo = "corerad";
rev = "v${version}"; rev = "v${version}";
sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k"; sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm";
}; };
vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw"; vendorSha256 = "123f9y1pfayfd5amkw5b8jzi8dbn7a16kbf7lzbmw69c1gj4gx9z";
doCheck = false; doCheck = false;

1
pkgs/top-level/aliases.nix
View file

@ -387,6 +387,7 @@ mapAliases ({
keepassx-community = keepassxc; # added 2017-11 keepassx-community = keepassxc; # added 2017-11
keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx2-http = keepassx-reboot; # added 2016-10-17 keepassx2-http = keepassx-reboot; # added 2016-10-17
kexectools = kexec-tools; # added 2021-09-03
keybase-go = keybase; # added 2016-08-24 keybase-go = keybase; # added 2016-08-24
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25 kicad-with-packages3d = kicad; # added 2019-11-25

16
pkgs/top-level/all-packages.nix
View file

@ -1029,9 +1029,9 @@ with pkgs;
}; };
termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { };
inherit (haskellPackages) ghcWithPackages;
}; termonad = termonad-with-packages;
termsyn = callPackage ../data/fonts/termsyn { }; termsyn = callPackage ../data/fonts/termsyn { };
@ -6352,7 +6352,7 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { }; keeperrl = callPackage ../games/keeperrl { };
kexectools = callPackage ../os-specific/linux/kexectools { }; kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;
@ -11480,7 +11480,7 @@ with pkgs;
# Please update doc/languages-frameworks/haskell.section.md, “Our # Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this: # current default compiler is”, if you bump this:
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106; haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8107;
inherit (haskellPackages) ghc; inherit (haskellPackages) ghc;
@ -16336,6 +16336,8 @@ with pkgs;
judy = callPackage ../development/libraries/judy { }; judy = callPackage ../development/libraries/judy { };
kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
keybinder = callPackage ../development/libraries/keybinder { keybinder = callPackage ../development/libraries/keybinder {
automake = automake111x; automake = automake111x;
lua = lua5_1; lua = lua5_1;
@ -18561,6 +18563,8 @@ with pkgs;
rubberband = callPackage ../development/libraries/rubberband { }; rubberband = callPackage ../development/libraries/rubberband { };
rustc-demangle = callPackage ../development/libraries/rustc-demangle { };
s2geometry = callPackage ../development/libraries/s2geometry { }; s2geometry = callPackage ../development/libraries/s2geometry { };
/* This package references ghc844, which we no longer have. Unfortunately, I /* This package references ghc844, which we no longer have. Unfortunately, I
@ -29469,6 +29473,8 @@ with pkgs;
inherit (gnome) zenity; inherit (gnome) zenity;
}; };
protonup = with python3Packages; toPythonApplication protonup;
sdlpop = callPackage ../games/sdlpop { }; sdlpop = callPackage ../games/sdlpop { };
stepmania = callPackage ../games/stepmania { stepmania = callPackage ../games/stepmania {

57
pkgs/top-level/haskell-packages.nix
View file

@ -6,8 +6,8 @@ let
"ghc865Binary" "ghc865Binary"
"ghc8102Binary" "ghc8102Binary"
"ghc8102BinaryMinimal" "ghc8102BinaryMinimal"
"ghc8105Binary" "ghc8107Binary"
"ghc8105BinaryMinimal" "ghc8107BinaryMinimal"
"integer-simple" "integer-simple"
"native-bignum" "native-bignum"
"ghcHEAD" "ghcHEAD"
@ -59,11 +59,11 @@ in {
minimal = true; minimal = true;
}; };
ghc8105Binary = callPackage ../development/compilers/ghc/8.10.5-binary.nix { ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
llvmPackages = pkgs.llvmPackages_11; llvmPackages = pkgs.llvmPackages_11;
}; };
ghc8105BinaryMinimal = callPackage ../development/compilers/ghc/8.10.5-binary.nix { ghc8107BinaryMinimal = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
llvmPackages = pkgs.llvmPackages_11; llvmPackages = pkgs.llvmPackages_11;
minimal = true; minimal = true;
}; };
@ -71,7 +71,7 @@ in {
ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5 # the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal packages.ghc8107BinaryMinimal
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then
@ -82,10 +82,10 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7; buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7;
}; };
ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix { ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5 # the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal packages.ghc8107BinaryMinimal
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@ -103,7 +103,7 @@ in {
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5 # the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal packages.ghc8107BinaryMinimal
# aarch64 ghc8102Binary exceeds max output size on hydra # aarch64 ghc8102Binary exceeds max output size on hydra
else if stdenv.isAarch64 || stdenv.isAarch32 then else if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal packages.ghc8102BinaryMinimal
@ -113,9 +113,27 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_10; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;
}; };
ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix {
# aarch64 ghc8102Binary exceeds max output size on hydra
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
else
packages.ghc8102Binary;
inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc901; # no binary yet bootPkgs = packages.ghc901; # no binary yet
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit (buildPackages.darwin) xattr;
buildLlvmPackages = buildPackages.llvmPackages_10; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;
libffi = pkgs.libffi; libffi = pkgs.libffi;
@ -166,15 +184,15 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet; packageSetConfig = bootstrapPackageSet;
}; };
ghc8105Binary = callPackage ../development/haskell-modules { ghc8107Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8105Binary; buildHaskellPackages = bh.packages.ghc8107Binary;
ghc = bh.compiler.ghc8105Binary; ghc = bh.compiler.ghc8107Binary;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet; packageSetConfig = bootstrapPackageSet;
}; };
ghc8105BinaryMinimal = callPackage ../development/haskell-modules { ghc8107BinaryMinimal = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8105BinaryMinimal; buildHaskellPackages = bh.packages.ghc8107BinaryMinimal;
ghc = bh.compiler.ghc8105BinaryMinimal; ghc = bh.compiler.ghc8107BinaryMinimal;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet; packageSetConfig = bootstrapPackageSet;
}; };
@ -183,9 +201,9 @@ in {
ghc = bh.compiler.ghc884; ghc = bh.compiler.ghc884;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
}; };
ghc8106 = callPackage ../development/haskell-modules { ghc8107 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8106; buildHaskellPackages = bh.packages.ghc8107;
ghc = bh.compiler.ghc8106; ghc = bh.compiler.ghc8107;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
}; };
ghc901 = callPackage ../development/haskell-modules { ghc901 = callPackage ../development/haskell-modules {
@ -193,6 +211,11 @@ in {
ghc = bh.compiler.ghc901; ghc = bh.compiler.ghc901;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
}; };
ghc921 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc921;
ghc = bh.compiler.ghc921;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules { ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD; buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD; ghc = bh.compiler.ghcHEAD;

2
pkgs/top-level/python-packages.nix
View file

@ -5696,6 +5696,8 @@ in {
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
protonup = callPackage ../development/python-modules/protonup { };
prov = callPackage ../development/python-modules/prov { }; prov = callPackage ../development/python-modules/prov { };
prox-tv = callPackage ../development/python-modules/prox-tv { }; prox-tv = callPackage ../development/python-modules/prox-tv { };

18
pkgs/top-level/release-haskell.nix
View file

@ -50,7 +50,7 @@ let
# list of all compilers to test specific packages on # list of all compilers to test specific packages on
all = with compilerNames; [ all = with compilerNames; [
ghc884 ghc884
ghc8106 ghc8107
ghc901 ghc901
]; ];
@ -278,14 +278,14 @@ let
# Test some statically linked packages to catch regressions # Test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC. # and get some cache going for static compilation with GHC.
# Use integer-simple to avoid GMP linking problems (LGPL) # Use integer-simple to avoid GMP linking problems (LGPL)
pkgsStatic.haskell.packages.integer-simple.ghc8106 = pkgsStatic.haskell.packages.integer-simple.ghc8107 =
removePlatforms removePlatforms
[ [
"aarch64-linux" # times out on Hydra "aarch64-linux" # times out on Hydra
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin "x86_64-darwin" # TODO: reenable when static libiconv works on darwin
] ]
{ {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106) inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107)
hello hello
lens lens
random random
@ -300,12 +300,12 @@ let
# package sets (like Cabal, jailbreak-cabal) are # package sets (like Cabal, jailbreak-cabal) are
# working as expected. # working as expected.
cabal-install = all; cabal-install = all;
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ]; Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ];
cabal2nix-unstable = all; cabal2nix-unstable = all;
funcmp = all; funcmp = all;
# Doesn't currently work on ghc-9.0: # Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297 # https://github.com/haskell/haskell-language-server/issues/297
haskell-language-server = with compilerNames; [ ghc884 ghc8106 ]; haskell-language-server = with compilerNames; [ ghc884 ghc8107 ];
hoogle = all; hoogle = all;
hsdns = all; hsdns = all;
jailbreak-cabal = all; jailbreak-cabal = all;
@ -379,7 +379,7 @@ let
constituents = accumulateDerivations [ constituents = accumulateDerivations [
jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8102Binary
jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8106 jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc901 jobs.pkgsMusl.haskell.compiler.ghc901
]; ];
}; };
@ -394,9 +394,9 @@ let
]; ];
}; };
constituents = accumulateDerivations [ constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random
]; ];
}; };
} }