BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-06-09 06:09:56 +00:00 committed by GitHub
commit f61a18a6e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 641 additions and 910 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View file

@ -71,6 +71,161 @@
<literal>fetchConfigured = false;</literal>.
</para>
</listitem>
<listitem>
<para>
fsharp41 has been removed in preference to use the latest
dotnet-sdk
</para>
</listitem>
<listitem>
<para>
The following F#-related packages have been removed for being
unmaintaned. Please use <literal>fetchNuGet</literal> for
specific packages.
</para>
<itemizedlist spacing="compact">
<listitem>
<para>
ExtCore
</para>
</listitem>
<listitem>
<para>
Fake
</para>
</listitem>
<listitem>
<para>
Fantomas
</para>
</listitem>
<listitem>
<para>
FsCheck
</para>
</listitem>
<listitem>
<para>
FsCheck262
</para>
</listitem>
<listitem>
<para>
FsCheckNunit
</para>
</listitem>
<listitem>
<para>
FSharpAutoComplete
</para>
</listitem>
<listitem>
<para>
FSharpCompilerCodeDom
</para>
</listitem>
<listitem>
<para>
FSharpCompilerService
</para>
</listitem>
<listitem>
<para>
FSharpCompilerTools
</para>
</listitem>
<listitem>
<para>
FSharpCore302
</para>
</listitem>
<listitem>
<para>
FSharpCore3125
</para>
</listitem>
<listitem>
<para>
FSharpCore4001
</para>
</listitem>
<listitem>
<para>
FSharpCore4117
</para>
</listitem>
<listitem>
<para>
FSharpData
</para>
</listitem>
<listitem>
<para>
FSharpData225
</para>
</listitem>
<listitem>
<para>
FSharpDataSQLProvider
</para>
</listitem>
<listitem>
<para>
FSharpFormatting
</para>
</listitem>
<listitem>
<para>
FsLexYacc
</para>
</listitem>
<listitem>
<para>
FsLexYacc706
</para>
</listitem>
<listitem>
<para>
FsLexYaccRuntime
</para>
</listitem>
<listitem>
<para>
FsPickler
</para>
</listitem>
<listitem>
<para>
FsUnit
</para>
</listitem>
<listitem>
<para>
Projekt
</para>
</listitem>
<listitem>
<para>
Suave
</para>
</listitem>
<listitem>
<para>
UnionArgParser
</para>
</listitem>
<listitem>
<para>
ExcelDnaRegistration
</para>
</listitem>
<listitem>
<para>
MathNetNumerics
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist>
</section>
<section xml:id="other-notable-changes">

33
nixos/doc/manual/release-notes/rl-2111.section.md
View file

@ -31,4 +31,37 @@ In addition to numerous new and upgraded packages, this release has the followin
* Those making use of `buildBazelPackage` will need to regenerate the fetch
hashes (preferred), or set `fetchConfigured = false;`.
* fsharp41 has been removed in preference to use the latest dotnet-sdk
* The following F#-related packages have been removed for being unmaintaned.
Please use `fetchNuGet` for specific packages.
- ExtCore
- Fake
- Fantomas
- FsCheck
- FsCheck262
- FsCheckNunit
- FSharpAutoComplete
- FSharpCompilerCodeDom
- FSharpCompilerService
- FSharpCompilerTools
- FSharpCore302
- FSharpCore3125
- FSharpCore4001
- FSharpCore4117
- FSharpData
- FSharpData225
- FSharpDataSQLProvider
- FSharpFormatting
- FsLexYacc
- FsLexYacc706
- FsLexYaccRuntime
- FsPickler
- FsUnit
- Projekt
- Suave
- UnionArgParser
- ExcelDnaRegistration
- MathNetNumerics
## Other Notable Changes

4
nixos/modules/hardware/video/nvidia.nix
View file

@ -92,7 +92,7 @@ in
example = "PCI:4:0:0";
description = ''
Bus ID of the AMD APU. You can find it using lspci; for example if lspci
shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0".
shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0".
'';
};
@ -159,7 +159,7 @@ in
description = ''
The NVIDIA X11 derivation to use.
'';
example = "config.boot.kernelPackages.nvidiaPackages.legacy340";
example = "config.boot.kernelPackages.nvidiaPackages.legacy_340";
};
};

3
pkgs/applications/misc/blender/default.nix
View file

@ -12,7 +12,7 @@
, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
, potrace
, openxr-loader
, embree, gmp
, embree, gmp, libharu
}:
with lib;
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
gmp
pugixml
potrace
libharu
]
++ (if (!stdenv.isDarwin) then [
libXi libX11 libXext libXrender

2
pkgs/development/beam-modules/default.nix
View file

@ -21,8 +21,8 @@ let
inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins;
rebar = callPackage ../tools/build-managers/rebar { };
# rebar3 port compiler plugin is required by buildRebar3
pc = callPackage ./pc { };
rebar3-proper = callPackage ./rebar3-proper { };
rebar3-nix = callPackage ./rebar3-nix { };
fetchHex = callPackage ./fetch-hex.nix { };

16
pkgs/development/beam-modules/erlang-ls/default.nix
View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }:
{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }:
let
version = "0.16.0";
owner = "erlang-ls";
@ -6,6 +6,11 @@ let
deps = import ./rebar-deps.nix {
inherit fetchHex fetchFromGitHub;
builder = buildRebar3;
overrides = (self: super: {
proper = super.proper.overrideAttrs (_: {
configurePhase = "true";
});
});
};
in rebar3Relx {
name = "erlang-ls";
@ -17,7 +22,16 @@ in rebar3Relx {
};
releaseType = "escript";
beamDeps = builtins.attrValues deps;
buildPlugins = [ rebar3-proper ];
buildPhase = "HOME=. make";
# based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml
# these tests are excessively long and we should probably skip them
checkPhase = ''
HOME=. epmd -daemon
HOME=. rebar3 ct
HOME=. rebar3 proper --constraint_tries 100
'';
doCheck = true;
installPhase = ''
mkdir -p $out/bin
cp _build/default/bin/erlang_ls $out/bin/

322
pkgs/development/beam-modules/erlang-ls/rebar-deps.nix
View file

@ -1,175 +1,219 @@
# Generated by rebar3_nix
let fetchOnly = { src, ... }: src;
in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec {
getopt = builder {
name = "getopt";
version = "1.0.1";
src = fetchHex {
pkg = "getopt";
in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }:
let
self = packages // (overrides self packages);
packages = with self; {
getopt = builder {
name = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
src = fetchHex {
pkg = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
zipper = builder {
name = "zipper";
version = "1.0.1";
src = fetchHex {
pkg = "zipper";
zipper = builder {
name = "zipper";
version = "1.0.1";
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
src = fetchHex {
pkg = "zipper";
version = "1.0.1";
sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
quickrand = builder {
name = "quickrand";
version = "2.0.1";
src = fetchHex {
pkg = "quickrand";
quickrand = builder {
name = "quickrand";
version = "2.0.1";
sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
src = fetchHex {
pkg = "quickrand";
version = "2.0.1";
sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
providers = builder {
name = "providers";
version = "1.8.1";
src = fetchHex {
pkg = "providers";
providers = builder {
name = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
src = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
};
beamDeps = [ getopt ];
};
beamDeps = [ getopt ];
};
katana_code = builder {
name = "katana_code";
version = "0.2.1";
src = fetchHex {
pkg = "katana_code";
katana_code = builder {
name = "katana_code";
version = "0.2.1";
sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
src = fetchHex {
pkg = "katana_code";
version = "0.2.1";
sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
bucs = builder {
name = "bucs";
version = "1.0.16";
src = fetchHex {
pkg = "bucs";
bucs = builder {
name = "bucs";
version = "1.0.16";
sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
src = fetchHex {
pkg = "bucs";
version = "1.0.16";
sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
yamerl = builder {
name = "yamerl";
version = "0.8.1";
src = fetchHex {
pkg = "yamerl";
yamerl = builder {
name = "yamerl";
version = "0.8.1";
sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
src = fetchHex {
pkg = "yamerl";
version = "0.8.1";
sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
uuid = builder {
name = "uuid";
version = "2.0.1";
src = fetchHex {
pkg = "uuid_erl";
uuid = builder {
name = "uuid";
version = "2.0.1";
sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
src = fetchHex {
pkg = "uuid_erl";
version = "2.0.1";
sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs=";
};
beamDeps = [ quickrand ];
};
beamDeps = [ quickrand ];
};
tdiff = builder {
name = "tdiff";
version = "0.1.2";
src = fetchHex {
pkg = "tdiff";
tdiff = builder {
name = "tdiff";
version = "0.1.2";
sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
src = fetchHex {
pkg = "tdiff";
version = "0.1.2";
sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
redbug = builder {
name = "redbug";
version = "2.0.6";
src = fetchHex {
pkg = "redbug";
redbug = builder {
name = "redbug";
version = "2.0.6";
sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
src = fetchHex {
pkg = "redbug";
version = "2.0.6";
sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
rebar3_format = builder {
name = "rebar3_format";
version = "0.8.2";
src = fetchHex {
pkg = "rebar3_format";
rebar3_format = builder {
name = "rebar3_format";
version = "0.8.2";
sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
src = fetchHex {
pkg = "rebar3_format";
version = "0.8.2";
sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM=";
};
beamDeps = [ katana_code ];
};
beamDeps = [ katana_code ];
};
ranch = builder {
name = "ranch";
version = "2.0.0";
src = fetchHex {
pkg = "ranch";
ranch = builder {
name = "ranch";
version = "2.0.0";
sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA=";
src = fetchHex {
pkg = "ranch";
version = "2.0.0";
sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
jsx = builder {
name = "jsx";
version = "3.0.0";
src = fetchHex {
pkg = "jsx";
jsx = builder {
name = "jsx";
version = "3.0.0";
sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
src = fetchHex {
pkg = "jsx";
version = "3.0.0";
sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0=";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
erlfmt = builder {
name = "erlfmt";
version = "git";
src = fetchFromGitHub {
owner = "whatsapp";
repo = "erlfmt";
rev = "2e93fc4a646111357642b0179a2a63151868d890";
sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
erlfmt = builder {
name = "erlfmt";
version = "git";
src = fetchFromGitHub {
owner = "whatsapp";
repo = "erlfmt";
rev = "2e93fc4a646111357642b0179a2a63151868d890";
sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr";
};
beamDeps = [ ];
};
beamDeps = [ ];
};
ephemeral = builder {
name = "ephemeral";
version = "2.0.4";
src = fetchHex {
pkg = "ephemeral";
ephemeral = builder {
name = "ephemeral";
version = "2.0.4";
sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
src = fetchHex {
pkg = "ephemeral";
version = "2.0.4";
sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA=";
};
beamDeps = [ bucs ];
};
beamDeps = [ bucs ];
};
elvis_core = builder {
name = "elvis_core";
version = "1.1.1";
src = fetchHex {
pkg = "elvis_core";
elvis_core = builder {
name = "elvis_core";
version = "1.1.1";
sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
src = fetchHex {
pkg = "elvis_core";
version = "1.1.1";
sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI=";
};
beamDeps = [ katana_code zipper ];
};
beamDeps = [ katana_code zipper ];
};
docsh = builder {
name = "docsh";
version = "0.7.2";
src = fetchHex {
pkg = "docsh";
docsh = builder {
name = "docsh";
version = "0.7.2";
sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
src = fetchHex {
pkg = "docsh";
version = "0.7.2";
sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ=";
};
beamDeps = [ providers ];
};
proper_contrib = builder {
name = "proper_contrib";
version = "0.2.0";
src = fetchHex {
pkg = "proper_contrib";
version = "0.2.0";
sha256 = "sha256-jFRRL1zr9JKaG1eqMDfcKk2xe93uOrXUenB14icVCBU=";
};
beamDeps = [ proper ];
};
proper = builder {
name = "proper";
version = "1.3.0";
src = fetchHex {
pkg = "proper";
version = "1.3.0";
sha256 = "sha256-SqGS/M3dA/2+UP72IL6dTS+SY1tU9V+4OuwYWZRAPLw=";
};
beamDeps = [ ];
};
meck = builder {
name = "meck";
version = "0.9.0";
src = fetchHex {
pkg = "meck";
version = "0.9.0";
sha256 = "sha256-+BPpDdC4myUWoCAaNV6EsavHi1dRqgy/ZpqdhagQrGM=";
};
beamDeps = [ ];
};
coveralls = builder {
name = "coveralls";
version = "2.2.0";
src = fetchHex {
pkg = "coveralls";
version = "2.2.0";
sha256 = "sha256-zVTbCqjGS1OSgBicVhns7hOkaiiw8ct3RUTdzBZiBKM=";
};
beamDeps = [ jsx ];
};
beamDeps = [ providers ];
};
}
in self

4
pkgs/development/beam-modules/mix-release.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }:
{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }:
{ pname
, version
@ -32,6 +32,8 @@ stdenv.mkDerivation (overridable // {
HEX_OFFLINE = 1;
DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation
# the api with `mix local.rebar rebar path` makes a copy of the binary
# some older dependencies still use rebar
MIX_REBAR = "${rebar}/bin/rebar";
MIX_REBAR3 = "${rebar3}/bin/rebar3";
postUnpack = ''

13
pkgs/development/beam-modules/rebar3-proper/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ lib, buildHex }:
buildHex {
name = "rebar3_proper";
version = "0.12.1";
sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6";
meta = {
description = "rebar3 proper plugin";
license = lib.licenses.bsd3;
homepage = "https://github.com/ferd/rebar3_proper";
};
}

12
pkgs/development/beam-modules/rebar3-release.nix
View file

@ -51,20 +51,12 @@ let
inherit src;
REBAR_IGNORE_DEPS = beamDeps != [ ];
configurePhase = ''
runHook preConfigure
${lib.optionalString (checkouts != null)
"cp --no-preserve=all -R ${checkouts}/_checkouts ."}
${# Prevent rebar3 from trying to manage deps
lib.optionalString (beamDeps != [ ]) ''
erl -noshell -eval '
{ok, Terms0} = file:consult("rebar.config"),
Terms = lists:keydelete(deps, 1, Terms0),
ok = file:write_file("rebar.config", [io_lib:format("~tp.~n", [T]) || T <- Terms]),
init:stop(0)
'
rm -f rebar.lock
''}
runHook postConfigure
'';

126
pkgs/development/compilers/fsharp41/default.nix
View file

@ -1,126 +0,0 @@
# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
stdenv.mkDerivation rec {
pname = "fsharp";
version = "4.1.34";
src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
autoconf
automake
which
mono
msbuild
dotnetbuildhelpers
dotnetPackages.FsCheck262
dotnetPackages.FSharpCompilerTools
dotnetPackages.FSharpCore302
dotnetPackages.FSharpCore3125
dotnetPackages.FSharpCore4001
dotnetPackages.FSharpCore4117
dotnetPackages.FSharpData225
dotnetPackages.FsLexYacc706
dotnetPackages.MicrosoftDiaSymReader
dotnetPackages.MicrosoftDiaSymReaderPortablePdb
dotnetPackages.NUnit350
dotnetPackages.SystemCollectionsImmutable131
dotnetPackages.SystemReflectionMetadata
dotnetPackages.SystemValueTuple
];
# https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches
# https://github.com/mono/mono/issues/7805
patches = [
./fsharp-IsPathRooted-type-inference.patch
./fsharp-string-switchName.patch
./fsharp-path-overloads.patch
./fsharp-GetFileNameWithoutExtension-type-inference.patch
];
configurePhase = ''
substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
./autogen.sh --prefix $out
'';
preBuild = ''
substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true"
substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" ""
substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" ""
substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" ""
substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" ""
rm -rf packages
mkdir packages
ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2
ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27
ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2
ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5
ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1
ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17
ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5
ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6
ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0
ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0
ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0
ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1
ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2
ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1
'';
# Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key
# ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path
# "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied.
preInstall = ''
find Release/ -name FSharp.Core.dll -exec chmod u+w {} \;
'';
# Set up some symlinks for backwards compatibility.
postInstall = ''
ln -s $out/bin/fsharpc $out/bin/fsc
ln -s $out/bin/fsharpi $out/bin/fsi
for dll in "$out/lib/mono/fsharp"/FSharp*.dll
do
create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
done
'';
doInstallCheck = true;
installCheckPhase = ''
echo 'printf "int = %i" (6 * 7);;' > script.fsx
$out/bin/fsi --exec script.fsx | grep "int = 42"
$out/bin/fsharpi --exec script.fsx | grep "int = 42"
$out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42"
cat > answer.fs <<EOF
open System
[<EntryPoint>]
let main argv =
printfn "int = %i" (6 * 7)
0
EOF
$out/bin/fsc answer.fs
${mono}/bin/mono answer.exe | grep "int = 42"
'';
# To fix this error when running:
# The file "/nix/store/path/whatever.exe" is an not a valid CIL image
dontStrip = true;
meta = {
description = "A functional CLI language";
homepage = "https://fsharp.org/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ thoughtpolice raskin ];
platforms = with lib.platforms; unix;
};
}

13
pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx
index 0bee9b79e..e6ceda11e 100644
--- a/src/scripts/fssrgen.fsx
+++ b/src/scripts/fssrgen.fsx
@@ -329,7 +329,7 @@ let StringBoilerPlate filename =
// END BOILERPLATE
"
-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) =
+let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) =
try
let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename)
if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then

21
pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch
View file

@ -1,21 +0,0 @@
commit c37fce5b3019c7a150203fc3a484885591b194de
Author: Alexis Christoforides <alexis@thenull.net>
Date: Sun Dec 2 00:10:24 2018 -0500
Help Path.IsPathRooted method overload selection.
.NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload.
diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
index cc797e305..699c7bb93 100644
--- a/src/scripts/scriptlib.fsx
+++ b/src/scripts/scriptlib.fsx
@@ -92,7 +92,7 @@ module Scripting =
module Process =
- let processExePath baseDir exe =
+ let processExePath baseDir (exe:string) =
if Path.IsPathRooted(exe) then exe
else
match Path.GetDirectoryName(exe) with

22
pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch
View file

@ -1,22 +0,0 @@
diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
index cc797e305..ae8a6d3cc 100644
--- a/src/scripts/scriptlib.fsx
+++ b/src/scripts/scriptlib.fsx
@@ -59,12 +59,12 @@ module Scripting =
let (++) a b = Path.Combine(a,b)
- let getBasename a = Path.GetFileNameWithoutExtension a
- let getFullPath a = Path.GetFullPath a
- let getFilename a = Path.GetFileName a
- let getDirectoryName a = Path.GetDirectoryName a
+ let getBasename (path: string) = Path.GetFileNameWithoutExtension path
+ let getFullPath (path: string) = Path.GetFullPath path
+ let getFilename (path: string) = Path.GetFileName path
+ let getDirectoryName (path: string) = Path.GetDirectoryName path
- let copyFile source dir =
+ let copyFile (source: string) dir =
let dest =
if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore
let result = Path.Combine(dir, Path.GetFileName source)

13
pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch
View file

@ -1,13 +0,0 @@
diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
index cc797e305..5a7be7d2b 100644
--- a/src/scripts/scriptlib.fsx
+++ b/src/scripts/scriptlib.fsx
@@ -36,7 +36,7 @@ module Scripting =
#if INTERACTIVE
let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray
- let getCmdLineArgOptional switchName =
+ let getCmdLineArgOptional (switchName: string) =
argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead
let getCmdLineArg switchName defaultValue =

6
pkgs/development/python-modules/azure-servicebus/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.2.0";
version = "7.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863";
sha256 = "sha256-NigQxqZjekZjlu6wSrziVwbEBclxfwSK4svd0eHPKr8=";
};
propagatedBuildInputs = [
@ -35,7 +35,7 @@ buildPythonPackage rec {
pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ];
meta = with lib; {
description = "This is the Microsoft Azure Service Bus Client Library";
description = "Microsoft Azure Service Bus Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];

13
pkgs/development/tools/build-managers/rebar3/default.nix
View file

@ -39,6 +39,12 @@ let
HOME=. escript bootstrap
'';
checkPhase = ''
HOME=. escript ./rebar3 ct
'';
doCheck = true;
installPhase = ''
mkdir -p $out/bin
cp rebar3 $out/bin/rebar3
@ -101,6 +107,9 @@ let
# instruct rebar3 to always load a certain plugin. It is necessary since
# REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this.
patches = [ ./skip-plugins.patch ./global-plugins.patch ];
# our patches cause the tests to fail
doCheck = false;
}));
in stdenv.mkDerivation {
pname = "rebar3-with-plugins";
@ -118,9 +127,11 @@ let
{ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]),
init:stop(0)
'
cp ${./rebar_ignore_deps.erl} rebar_ignore_deps.erl
erlc -o $out/lib/rebar/ebin rebar_ignore_deps.erl
mkdir -p $out/bin
makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \
--set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \
--set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames} rebar_ignore_deps" \
--suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \
--add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra"
'';

168
pkgs/development/tools/build-managers/rebar3/rebar-deps.nix
View file

@ -1,54 +1,118 @@
# Generated by rebar3_nix
{ fetchHex, fetchFromGitHub }:
{
ssl_verify_fun = fetchHex {
pkg = "ssl_verify_fun";
version = "1.1.6";
sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA=";
let fetchOnly = { src, ... }: src;
in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }:
let
self = packages // (overrides self packages);
packages = with self; {
ssl_verify_fun = builder {
name = "ssl_verify_fun";
version = "1.1.6";
src = fetchHex {
pkg = "ssl_verify_fun";
version = "1.1.6";
sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA=";
};
beamDeps = [ ];
};
relx = builder {
name = "relx";
version = "4.4.0";
src = fetchHex {
pkg = "relx";
version = "4.4.0";
sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU=";
};
beamDeps = [ bbmustache ];
};
providers = builder {
name = "providers";
version = "1.8.1";
src = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
};
beamDeps = [ getopt ];
};
getopt = builder {
name = "getopt";
version = "1.0.1";
src = fetchHex {
pkg = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
};
beamDeps = [ ];
};
eunit_formatters = builder {
name = "eunit_formatters";
version = "0.5.0";
src = fetchHex {
pkg = "eunit_formatters";
version = "0.5.0";
sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k=";
};
beamDeps = [ ];
};
erlware_commons = builder {
name = "erlware_commons";
version = "1.5.0";
src = fetchHex {
pkg = "erlware_commons";
version = "1.5.0";
sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns=";
};
beamDeps = [ cf ];
};
cth_readable = builder {
name = "cth_readable";
version = "1.5.1";
src = fetchHex {
pkg = "cth_readable";
version = "1.5.1";
sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA=";
};
beamDeps = [ cf ];
};
cf = builder {
name = "cf";
version = "0.3.1";
src = fetchHex {
pkg = "cf";
version = "0.3.1";
sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI=";
};
beamDeps = [ ];
};
certifi = builder {
name = "certifi";
version = "2.6.1";
src = fetchHex {
pkg = "certifi";
version = "2.6.1";
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
};
beamDeps = [ ];
};
bbmustache = builder {
name = "bbmustache";
version = "1.10.0";
src = fetchHex {
pkg = "bbmustache";
version = "1.10.0";
sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
};
beamDeps = [ ];
};
meck = builder {
name = "meck";
version = "0.8.13";
src = fetchHex {
pkg = "meck";
version = "0.8.13";
sha256 = "sha256-008BPBVttRrVfMVWiRuXIOahwd9f4uFa+ZnITWzr6xo=";
};
beamDeps = [ ];
};
};
relx = fetchHex {
pkg = "relx";
version = "4.4.0";
sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU=";
};
providers = fetchHex {
pkg = "providers";
version = "1.8.1";
sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";
};
getopt = fetchHex {
pkg = "getopt";
version = "1.0.1";
sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw=";
};
eunit_formatters = fetchHex {
pkg = "eunit_formatters";
version = "0.5.0";
sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k=";
};
erlware_commons = fetchHex {
pkg = "erlware_commons";
version = "1.5.0";
sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns=";
};
cth_readable = fetchHex {
pkg = "cth_readable";
version = "1.5.1";
sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA=";
};
cf = fetchHex {
pkg = "cf";
version = "0.3.1";
sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI=";
};
certifi = fetchHex {
pkg = "certifi";
version = "2.6.1";
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
};
bbmustache = fetchHex {
pkg = "bbmustache";
version = "1.10.0";
sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4=";
};
}
in self

43
pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl Normal file
View file

@ -0,0 +1,43 @@
%% This module, when loaded as a plugin, overrides the default `install_deps`
%% provider and erases the dependencies from the rebar3 state, when
%% REBAR_IGNORE_DEPS is true.
-module(rebar_ignore_deps).
-export([init/1, do/1, format_error/1]).
init(State0) ->
case os:getenv("REBAR_IGNORE_DEPS", "") of
"" ->
{ok, State0};
_ ->
do_init(State0)
end.
do_init(State0) ->
State1 = rebar_state:allow_provider_overrides(State0, true),
Provider = providers:create(
[
{name, install_deps}, %% override the default install_deps provider
{module, ?MODULE},
{bare, false},
{deps, [app_discovery]},
{example, undefined},
{opts, []},
{short_desc, ""},
{desc, ""}
]),
State2 = rebar_state:add_provider(State1, Provider),
{ok, rebar_state:allow_provider_overrides(State2, false)}.
do(State0) ->
io:format("Ignoring deps...~n"),
Profiles = rebar_state:current_profiles(State0),
State = lists:foldl(fun(P, Acc0) ->
Acc = rebar_state:set(Acc0, {deps, P}, []),
rebar_state:set(Acc, {parsed_deps, P}, [])
end, State0, Profiles),
{ok, State}.
format_error(Reason) ->
io_lib:format("~p", [Reason]).

12
pkgs/misc/vim-plugins/generated.nix
View file

@ -3995,6 +3995,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
};
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence-nvim";
version = "2021-06-08";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
rev = "f4c1e227be0a0c863c2de201155401950eda572e";
sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
PreserveNoEOL = buildVimPluginFrom2Nix {
pname = "PreserveNoEOL";
version = "2013-06-14";

1
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -20,6 +20,7 @@ AndrewRadev/sideways.vim@main
AndrewRadev/splitjoin.vim@main
andsild/peskcolor.vim
andviro/flake8-vim
andweeb/presence.nvim
andymass/vim-matchup
andys8/vim-elm-syntax
antoinemadec/coc-fzf

12
pkgs/misc/vscode-extensions/default.nix
View file

@ -841,6 +841,18 @@ let
};
};
octref.vetur = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vetur";
publisher = "octref";
version = "0.34.1";
sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby";
};
meta = {
license = lib.licenses.mit;
};
};
redhat.java = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "java";

38
pkgs/servers/monitoring/grafana/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "7.5.7";
version = "8.0.0";
excludedPackages = [ "release_publisher" ];
@ -10,32 +10,32 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-GTQK02zxOBTE+93vT0zLMhAeZ7F3Cq/0lbvbzwB2QZA=";
sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-IQ7aAuUrNa+bSh5ld6IttujM8AgKUSlu8H7pwzDi164=";
sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4=";
};
vendorSha256 = "sha256-AsPRaRLomp090XAKLXLXKm40ESPO4im9qi6VLpLYRQU=";
vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM=";
# grafana-aws-sdk is specified with two versions which causes a problem later:
# go: inconsistent vendoring in /build/source:
# github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
# Remove the older one here to fix this.
postPatch = ''
substituteInPlace go.mod \
--replace 'github.com/grafana/grafana-aws-sdk v0.3.0' ""
substituteInPlace pkg/cmd/grafana-server/main.go \
--replace 'var version = "5.0.0"' 'var version = "${version}"'
'';
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas
preBuild = ''
rm -r dashboard-schemas scripts/go
# The testcase makes an API call against grafana.com:
#
# --- Expected
# +++ Actual
# @@ -1,4 +1,4 @@
# (map[string]interface {}) (len=2) {
# - (string) (len=5) "error": (string) (len=16) "plugin not found",
# - (string) (len=7) "message": (string) (len=16) "Plugin not found"
# + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused",
# + (string) (len=7) "message": (string) (len=24) "Failed to install plugin"
# }
sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
rm -r scripts/go
'';
postInstall = ''

9
pkgs/servers/sql/postgresql/default.nix
View file

@ -240,4 +240,13 @@ in self: {
thisAttr = "postgresql_13";
inherit self;
};
postgresql_14 = self.callPackage generic {
version = "14beta1";
psqlSchema = "14";
sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464";
this = self.postgresql_14;
thisAttr = "postgresql_14";
inherit self;
};
}

6
pkgs/tools/misc/dua/default.nix
View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
version = "2.12.2";
version = "2.13.0";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
sha256 = "sha256-0w9RKkoKWwPrVLkQieL69HIsSWbqS0vQesi7yijwXRw=";
sha256 = "sha256-gJOEMp2Ex9gBsvYOmIKH7WNLQejiJhY8wnw2JYxcUU4=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-JqOblCWJSKuTzE4XQzk5nCQL7NIwC5ZDhue1HA7JdzA=";
cargoSha256 = "sha256-cN5rURv1RmesLzwm3ZXyGJXxvFeIbpTb6kWzJSKgX5o=";
doCheck = false;

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

@ -237,6 +237,7 @@ mapAliases ({
'';
font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
foomatic_filters = foomatic-filters; # 2016-08
fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25
fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15

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

@ -11103,8 +11103,6 @@ in
fsharp = callPackage ../development/compilers/fsharp { };
fsharp41 = callPackage ../development/compilers/fsharp41 { };
fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
@ -19689,6 +19687,7 @@ in
postgresql_11
postgresql_12
postgresql_13
postgresql_14
;
postgresql = postgresql_11.override { this = postgresql; };
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;

480
pkgs/top-level/dotnet-packages.nix
View file

@ -8,14 +8,12 @@
, glib
, pkg-config
, mono
, fsharp
, overrides ? {}
}:
let self = dotnetPackages // overrides; dotnetPackages = with self; {
# BINARY PACKAGES
Autofac = fetchNuGet {
baseName = "Autofac";
version = "3.5.2";
@ -23,176 +21,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ];
};
Fake = fetchNuGet {
baseName = "FAKE";
version = "3.33.0";
sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm";
outputFiles = [ "tools/*" ];
dllFiles = [ "Fake*.dll" ];
};
Fantomas = fetchNuGet {
baseName = "Fantomas";
version = "4.4.0";
sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o=";
outputFiles = [ "lib/*" ];
dllFiles = [ "Fantomas*.dll" ];
meta = with lib; {
description = "FSharp source code formatter";
homepage = "https://github.com/fsprojects/fantomas";
license = licenses.asl20;
maintainers = [ maintainers.ratsclub ];
};
};
FSharpCompilerCodeDom = fetchNuGet {
baseName = "FSharp.Compiler.CodeDom";
version = "0.9.2";
sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj";
outputFiles = [ "lib/net40/*" ];
};
FSharpCore302 = fetchNuGet {
baseName = "FSharp.Core";
version = "3.0.2";
sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q";
outputFiles = [ "*" ];
};
FSharpCore3125 = fetchNuGet {
baseName = "FSharp.Core";
version = "3.1.2.5";
sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih";
outputFiles = [ "*" ];
};
FSharpCore4001 = fetchNuGet {
baseName = "FSharp.Core";
version = "4.0.0.1";
sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k";
outputFiles = [ "*" ];
};
FSharpCore4117 = fetchNuGet {
baseName = "FSharp.Core";
version = "4.1.17";
sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1";
outputFiles = [ "*" ];
};
FSharpData = fetchNuGet {
baseName = "FSharp.Data";
version = "4.1.1";
sha256 = "0ytjiQi8vQQU51JYexnC13Bi7NqVmLRzM75SOZ+hhQU=";
outputFiles = [ "lib/*" ];
meta = with lib; {
description = "F# Data: Library for Data Access";
homepage = "https://fsprojects.github.io/FSharp.Data/";
license = licenses.asl20;
maintainers = [ maintainers.ratsclub ];
};
};
FSharpData225 = fetchNuGet {
baseName = "FSharp.Data";
version = "2.2.5";
sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724";
outputFiles = [ "*" ];
};
FSharpDataSQLProvider = fetchNuGet {
baseName = "SQLProvider";
version = "0.0.9-alpha";
sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w";
outputFiles = [ "lib/net40/*" ];
};
FsCheck = fetchNuGet {
baseName = "FsCheck";
version = "1.0.4";
sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad";
outputFiles = [ "lib/net45/*" ];
};
FsCheck262 = fetchNuGet {
baseName = "FsCheck";
version = "2.6.2";
sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl";
outputFiles = [ "*" ];
};
FsCheckNunit = fetchNuGet {
baseName = "FsCheck.Nunit";
version = "1.0.4";
sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy";
outputFiles = [ "lib/net45/*" ];
};
FSharpCompilerTools = fetchNuGet {
baseName = "FSharp.Compiler.Tools";
version = "4.1.27";
sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl";
outputFiles = [ "*" ];
};
FsLexYacc = fetchNuGet {
baseName = "FsLexYacc";
version = "6.1.0";
sha256 = "1v5myn62zqs431i046gscqw2v0c969fc7pdplx7z9cnpy0p2s4rv";
outputFiles = [ "build/*" ];
};
FsLexYacc706 = fetchNuGet {
baseName = "FsLexYacc";
version = "7.0.6";
sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2";
outputFiles = [ "*" ];
};
FsLexYaccRuntime = fetchNuGet {
baseName = "FsLexYacc.Runtime";
version = "6.1.0";
sha256 = "18vrx4lxsn4hkfishg4abv0d4q21dsph0bm4mdq5z8afaypp5cr7";
outputFiles = [ "lib/net40/*" ];
};
FsPickler = fetchNuGet {
baseName = "FsPickler";
version = "1.2.9";
sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4";
outputFiles = [ "lib/net45/*" ];
};
FsUnit = fetchNuGet {
baseName = "FsUnit";
version = "1.3.0.1";
sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64";
outputFiles = [ "Lib/Net40/*" ];
};
FSharpFormatting = fetchNuGet {
baseName = "FSharp.Formatting";
version = "11.2.0";
sha256 = "4IMrd+jpRZw+vBXx4X89/B/Fdpiuy2hwtmQNGWQp0wM=";
outputFiles = [ "lib/*" ];
postUnpack = ''
chmod -R a+r $sourceRoot
'';
meta = with lib; {
description = "F# tools for generating documentation (Markdown processor and F# code formatter)";
homepage = "https://fsprojects.github.io/FSharp.Formatting/";
longDescription = ''
The FSharp.Formatting package includes libraries and tools for processing F# script files,
markdown and components for documentation generation.
'';
license = licenses.asl20;
maintainers = [ maintainers.ratsclub ];
};
};
NUnit3 = fetchNuGet {
baseName = "NUnit";
version = "3.0.1";
@ -349,15 +177,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i";
outputFiles = [ "*" ];
};
Suave = fetchNuGet {
baseName = "Suave";
version = "0.29.0";
propagatedBuildInputs = [ FsPickler ];
sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln";
outputFiles = [ "lib/net40/*" ];
};
# SOURCE PACKAGES
Boogie = buildDotnetPackage rec {
@ -518,164 +337,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
ExcelDnaRegistration = buildDotnetPackage rec {
baseName = "Excel-DNA.Registration";
version = "git-" + (builtins.substring 0 10 rev);
rev = "69abb1b3528f40dbcf425e13690aaeab5f707bb6";
src = fetchFromGitHub {
inherit rev;
owner = "Excel-DNA";
repo = "Registration";
sha256 = "094932h6r2f4x9r5mnw8rm4jzz8vkfv90d95qi3h0i89ws2dnn07";
};
buildInputs = [
fsharp
dotnetPackages.ExcelDna
];
xBuildFiles = [ "Source/ExcelDna.Registration/ExcelDna.Registration.csproj" "Source/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.fsproj" ];
outputFiles = [ "Source/ExcelDna.Registration/bin/Release/*" "Source/ExcelDna.Registration.FSharp/bin/Release/*FSharp*" ];
meta = {
description = "This library implements helper functions to assist and modify the Excel-DNA function registration";
homepage = "https://github.com/Excel-DNA/Registration";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
ExtCore = buildDotnetPackage {
baseName = "ExtCore";
version = "0.8.46";
src = fetchFromGitHub {
owner = "jack-pappas";
repo = "ExtCore";
rev = "0269b6d3c479f45abd7aa983aaeca08d07473943";
sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p";
};
buildInputs = [
fsharp
dotnetPackages.NUnit
dotnetPackages.FsCheck
];
postConfigure = ''
# Fix case
sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj
'';
xBuildFlags = [ "/p:Configuration=Release (net45)" ];
outputFiles = [ "ExtCore/bin/net45/Release/*" ];
meta = {
description = "ExtCore is an extended core library for F#";
homepage = "https://github.com/jack-pappas/ExtCore";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
broken = true;
};
};
FSharpAutoComplete = buildDotnetPackage rec {
baseName = "FSharp.AutoComplete";
version = "0.18.2";
src = fetchFromGitHub {
owner = "fsharp";
repo = "FSharp.AutoComplete";
rev = version;
sha256 = "1ikl72003xzqq2dc8i6h404hnq3q5g1p1q4rmzz9bdm7282q2jgs";
};
buildInputs = [
fsharp
glib
dotnetPackages.FSharpCompilerService
dotnetPackages.NewtonsoftJson
dotnetPackages.NDeskOptions
];
outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ];
meta = {
description = "An interface to the FSharp.Compiler.Service project";
longDescription = ''
This project provides a command-line interface to the
FSharp.Compiler.Service project. It is intended to be used as a backend
service for rich editing or 'intellisense' features for editors.
'';
homepage = "https://github.com/fsharp/FSharp.AutoComplete";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
FSharpCompilerService = buildDotnetPackage {
baseName = "FSharp.Compiler.Service";
version = "0.0.90";
src = fetchFromGitHub {
owner = "fsharp";
repo = "FSharp.Compiler.Service";
rev = "a87939ab3f3c571cad79bc3b5f298aa3e180e6b3";
sha256 = "0axr38q8m0h11hhbxg5myd1wwfgysadriln8c7bqsv5sf9djihvd";
};
buildInputs = [
fsharp
dotnetPackages.NUnit
];
outputFiles = [ "bin/v4.5/*" ];
meta = {
description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings";
homepage = "https://fsharp.github.io/FSharp.Compiler.Service/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
# FSharpxExtras = buildDotnetPackage rec {
# baseName = "FSharpx.Extras";
# version = "1.8.41";
#
# src = fetchurl {
# name = "${baseName}-${version}.tar.gz";
# url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz";
# sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl";
# };
#
# buildInputs = [
# fsharp
# dotnetPackages.NUnit
# dotnetPackages.FsCheck
# dotnetPackages.FsCheckNunit
# dotnetPackages.FsUnit
# ];
#
# patches = [ ./disable_excel.patch ];
#
# xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ];
# outputFiles = [ "build/*" ];
#
# meta = {
# description = "FSharpx.Extras is a collection of libraries and tools for use with F#";
# homepage = "https://fsprojects.github.io/FSharpx.Extras/";
# license = lib.licenses.asl20;
# maintainers = with lib.maintainers; [ obadz ];
# platforms = with lib.platforms; linux;
# };
# };
GitVersionTree = buildDotnetPackage {
baseName = "GitVersionTree";
version = "2013-10-01";
@ -724,30 +385,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
MathNetNumerics = buildDotnetPackage rec {
baseName = "MathNet.Numerics";
version = "3.7.0";
src = fetchurl {
name = "${baseName}-${version}.tar.gz";
url = "https://github.com/mathnet/mathnet-numerics/archive/v${version}.tar.gz";
sha256 = "1yq6aqmc2gwh96z544qn83kby01lv1lsxm158hq0bimv2i9yywc7";
};
buildInputs = [ fsharp ];
xBuildFiles = [ "MathNet.Numerics.sln" ];
outputFiles = [ "out/lib/Net40/*" "src/FSharp/MathNet.Numerics.fsx" "src/FSharp/MathNet.Numerics.IfSharp.fsx" ];
meta = {
description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono";
homepage = "https://numerics.mathdotnet.com/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
MonoAddins = buildDotnetPackage rec {
baseName = "Mono.Addins";
version = "1.2";
@ -780,62 +417,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
};
};
# MonoDevelopFSharpBinding = buildDotnetPackage rec {
# baseName = "MonoDevelop.FSharpBinding";
# version = "git-a09c8185eb";
# broken = true;
# src = fetchFromGitHub {
# owner = "fsharp";
# repo = "fsharpbinding";
# rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011";
# sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91";
# };
# buildInputs = [
# fsharp
# monodevelop
# pkgs.gtk-sharp
# pkgs.gnome-sharp
# dotnetPackages.ExtCore
# dotnetPackages.FSharpCompilerService
# dotnetPackages.FSharpCompilerCodeDom
# dotnetPackages.FSharpAutoComplete
# dotnetPackages.Fantomas
# ];
# patches = [
# ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
# ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
# ];
# preConfigure = ''
# substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop
# substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop
# (cd monodevelop; fsharpi ./configure.fsx)
# '';
# # This will not work as monodevelop probably looks in absolute nix store path rather than path
# # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding
# # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way
# # postInstall = ''
# # mkdir -p "$out/lib/monodevelop/AddIns"
# # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns"
# # '';
# xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ];
# outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ];
# meta = {
# description = "F# addin for MonoDevelop 5.9";
# homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9";
# license = lib.licenses.asl20;
# maintainers = with lib.maintainers; [ obadz ];
# platforms = with lib.platforms; linux;
# };
# };
NDeskOptions = stdenv.mkDerivation rec {
pname = "NDesk.Options";
@ -900,67 +481,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
outputFiles = [ "*" ];
};
Projekt = buildDotnetPackage rec {
baseName = "projekt";
version = "git-" + (builtins.substring 0 10 rev);
rev = "715a21e5cd3c86310387562618b04e979d0ec9c4";
src = fetchFromGitHub {
inherit rev;
owner = "kjnilsson";
repo = "projekt";
sha256 = "1ph3af07wmia6qkiq1qlywaj2xh6zn5drdx19dwb1g3237h5fnz0";
};
buildInputs = [
fsharp
dotnetPackages.UnionArgParser
dotnetPackages.FsUnit
];
preConfigure = ''
sed -i -e "s/FSharp.Core, Version=\$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/FSharp.Core/" src/Projekt/Projekt.fsproj
'';
outputFiles = [ "src/Projekt/bin/Release/*" ];
meta = {
description = "A command-line tool for manipulating F# project files";
homepage = "https://github.com/kjnilsson/projekt";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
UnionArgParser = buildDotnetPackage {
baseName = "UnionArgParser";
version = "0.8.7";
src = fetchFromGitHub {
owner = "nessos";
repo = "UnionArgParser";
rev = "acaeb946e53cbb0bd9768977c656b3242146070a";
sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als";
};
buildInputs = [
fsharp
dotnetPackages.NUnit
dotnetPackages.FsUnit
];
outputFiles = [ "bin/net40/*" ];
meta = {
description = "A declarative CLI argument/XML configuration parser for F# applications";
homepage = "https://nessos.github.io/UnionArgParser/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obadz ];
platforms = with lib.platforms; linux;
};
};
YamlDotNet = fetchNuGet {
baseName = "YamlDotNet";
version = "11.1.1";