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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-19 00:42:26 +00:00 committed by GitHub
commit 6904262415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 2750 additions and 1502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/virtualization/vpcs/default.nix
View File

@ -1,19 +1,16 @@
{ stdenv, fetchurl, glibc }:
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "vpcs";
version = "0.8";
version = "0.8.1";
src = fetchurl {
name = "${pname}-${version}.tar.bz2";
url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
src = fetchFromGitHub {
owner = "GNS3";
repo = pname;
rev = "v${version}";
sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak";
};
patches = [ ./vpcs-0.8-glibc-2.26.patch ];
buildInputs = [ glibc.static ];
buildPhase = ''(
cd src
./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
@ -27,13 +24,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Virtual PC simulator";
description = "A simple virtual PC simulator";
longDescription = ''
The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or
ping/traceroute the other hosts/routers from the VPCS when you study the
Cisco routers in the dynamips.
The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can
ping/traceroute them, or ping/traceroute the other hosts/routers from the
VPCS when you study the Cisco routers in the dynamips.
'';
homepage = "https://sourceforge.net/projects/vpcs/";
inherit (src.meta) homepage;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];

14
pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch
View File

@ -1,14 +0,0 @@
diff --git a/src/getopt.h b/src/getopt.h
index 4394aa2..bf59e10 100644
--- a/src/getopt.h
+++ b/src/getopt.h
@@ -49,9 +49,6 @@ extern int optind;
extern int opterr;
extern int optopt;
-#ifndef FreeBSD
-int getopt(int argc, char** argv, char* optstr);
-#endif
int arg_to_int(const char* arg, int min, int max, int defalt);
#ifdef __cplusplus

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz";
sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/13d33ba1a0ce6acd583dee6a8a2c7e7398fa30cd.tar.gz";
sha256 = "0ggm1iv2ilxj39icqjx4dk9p3sbndvrf90v2qssz9h49xsv9w0j7";
}

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

@ -176,9 +176,6 @@ self: super: {
# https://github.com/jputcu/serialport/issues/25
serialport = dontCheck super.serialport;
# Test suite build depends on ancient tasty 0.11.x.
cryptohash-sha512 = dontCheck super.cryptohash-sha512;
# Test suite depends on source code being available
simple-affine-space = dontCheck super.simple-affine-space;
@ -815,6 +812,12 @@ self: super: {
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;
# Depends on base <4.12
# See https://github.com/haskell-hvr/cryptohash-sha512/pull/3
# , https://github.com/haskell-hvr/cryptohash-sha512/issues/4
# and https://github.com/haskell-hvr/cryptohash-sha512/pull/5
cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
# Depends on tasty < 1.x, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
@ -859,6 +862,10 @@ self: super: {
snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
# hledger-lib requires the latest version of pretty-simple
hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; };
pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; });
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@ -889,6 +896,7 @@ self: super: {
'';
});
hledger-web = overrideCabal super.hledger-web (drv: {
preCheck = "export HOME=$TMPDIR";
postInstall = ''
for i in $(seq 1 9); do
for j in *.$i; do
@ -948,6 +956,8 @@ self: super: {
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
niv = generateOptparseApplicativeCompletion "niv" super.niv;
ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
# musl fixes
@ -1397,24 +1407,17 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
fourmolu = self.fourmolu_0_3_0_0;
});
fourmolu = dontCheck super.fourmolu;
ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch {
# 2020-11-13: Bumping bounds via an already upstream merged change
# https://github.com/haskell/ghcide/pull/905
url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch;
sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6";
includes = [ "ghcide.cabal" ];
}));
# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck
(super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; })
));
refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print;
# the hls brittany is objectively better, because there hasn‘t been a
# brittany release in a while and this version works with 8.10.
# And we need to build it anyways.
# 2020-11-15: jailbreaking because we have strict 0.4 which is to new
brittany = self.hls-brittany;
hls-brittany = dontCheck (doJailbreak super.hls-brittany);
# 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
aeson = dontCheck super.aeson;
@ -1495,13 +1498,13 @@ self: super: {
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
cachix = appendPatch super.cachix (pkgs.fetchpatch {
cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
});
}));
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text;
@ -1512,7 +1515,6 @@ self: super: {
# 2020-11-23: https://github.com/cdornan/fmt/issues/30
fmt = dontCheck super.fmt;
# 2020-11-27: Tests broken
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
@ -1520,4 +1522,23 @@ self: super: {
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
# 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_3;
};
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
pandoc-include-code = doJailbreak super.pandoc-include-code;
# https://github.com/jgm/pandoc/issues/6961
pandoc = dontCheck super.pandoc;
# Update pandoc dependencies to fix the build.
doctemplates = self.doctemplates_0_9;
skylighting = self.skylighting_0_10_2;
skylighting-core = self.skylighting-core_0_10_2;
# https://github.com/yesodweb/yesod/issues/1714
yesod-core = dontCheck super.yesod-core;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -76,7 +76,7 @@ default-package-overrides:
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
# Stackage Nightly 2020-12-04
# Stackage Nightly 2020-12-14
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -292,7 +292,7 @@ default-package-overrides:
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.11
- base-orphans ==0.8.3
- base-orphans ==0.8.4
- base-prelude ==1.4
- base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
@ -332,6 +332,7 @@ default-package-overrides:
- bitset-word8 ==0.1.1.2
- bits-extra ==0.0.2.0
- bitvec ==1.0.3.0
- bitwise-enum ==1.0.0.2
- blake2 ==0.3.0
- blanks ==0.5.0
- blas-carray ==0.1.0.1
@ -367,6 +368,7 @@ default-package-overrides:
- btrfs ==0.2.0.0
- buffer-builder ==0.2.4.7
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.1
- bugsnag-hs ==0.2.0.3
- bugzilla-redhat ==0.3.0
- burrito ==1.2.0.0
@ -391,7 +393,7 @@ default-package-overrides:
- bzlib ==0.5.1.0
- bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1
- c2hs ==0.28.6
- c2hs ==0.28.7
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
@ -440,7 +442,7 @@ default-package-overrides:
- checkers ==0.5.6
- checksum ==0.0
- chimera ==0.3.1.0
- chiphunk ==0.1.2.1
- chiphunk ==0.1.4.0
- choice ==0.2.2
- chronologique ==0.3.1.3
- chronos ==1.1.1
@ -462,6 +464,7 @@ default-package-overrides:
- Clipboard ==2.3.2.0
- clock ==0.8
- clock-extras ==0.1.0.2
- closed ==0.2.0.1
- clumpiness ==0.17.0.2
- ClustalParser ==1.3.0
- cmark ==0.6
@ -649,11 +652,11 @@ default-package-overrides:
- deriving-aeson ==0.2.6
- deriving-compat ==0.5.10
- derulo ==1.0.9
- dhall ==1.36.0
- dhall-bash ==1.0.34
- dhall-json ==1.7.3
- dhall-lsp-server ==1.0.11
- dhall-yaml ==1.2.3
- dhall ==1.37.0
- dhall-bash ==1.0.35
- dhall-json ==1.7.4
- dhall-lsp-server ==1.0.12
- dhall-yaml ==1.2.4
- diagrams-solve ==0.1.2
- dialogflow-fulfillment ==0.1.1.3
- di-core ==1.0.4
@ -743,6 +746,7 @@ default-package-overrides:
- enumset ==0.0.5
- enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0
- envparse ==0.4.1
- envy ==2.1.0.0
- epub-metadata ==4.5
- eq ==4.2.1
@ -750,6 +754,8 @@ default-package-overrides:
- equational-reasoning ==0.6.0.3
- equivalence ==0.3.5
- erf ==2.0.0.0
- error-or ==0.1.1.0
- error-or-utils ==0.1.1
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.8
@ -835,7 +841,7 @@ default-package-overrides:
- fmlist ==0.9.4
- fmt ==0.6.1.2
- fn ==0.3.0.2
- focus ==1.0.1.4
- focus ==1.0.2
- focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
@ -990,7 +996,7 @@ default-package-overrides:
- gravatar ==0.8.0
- groom ==0.1.2.1
- group-by-date ==0.1.0.3
- groups ==0.5
- groups ==0.5.2
- gtk-sni-tray ==0.1.6.0
- gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1
@ -1098,7 +1104,7 @@ default-package-overrides:
- hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.9
- hpack ==0.34.2
- hpack ==0.34.3
- hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.0
- hpc-lcov ==1.0.1
@ -1166,7 +1172,7 @@ default-package-overrides:
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.1
- http-conduit ==2.3.7.3
- http-conduit ==2.3.7.4
- http-date ==0.0.10
- http-directory ==0.1.8
- http-download ==0.2.0.0
@ -1239,6 +1245,7 @@ default-package-overrides:
- Imlib ==0.1.2
- immortal ==0.3
- immortal-queue ==0.1.0.1
- inbox ==0.1.0
- include-file ==0.1.0.4
- incremental-parser ==0.5
- indents ==0.5.0.1
@ -1444,7 +1451,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- massiv ==0.5.7.0
- massiv ==0.5.8.0
- massiv-io ==0.4.0.0
- massiv-test ==0.1.5
- mathexpr ==0.3.0.0
@ -1510,6 +1517,7 @@ default-package-overrides:
- mmorph ==1.1.3
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
- mock-time ==0.1.0
- mod ==0.1.2.0
- model ==0.5
- modern-uri ==0.3.3.0
@ -1524,10 +1532,10 @@ default-package-overrides:
- monadlist ==0.0.2
- monad-logger ==0.3.36
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.11
- monad-logger-prefix ==0.1.12
- monad-loops ==0.4.3
- monad-memo ==0.5.3
- monad-metrics ==0.2.1.4
- monad-metrics ==0.2.2.0
- monad-par ==0.3.5
- monad-parallel ==0.7.2.3
- monad-par-extras ==0.3.3
@ -1657,7 +1665,7 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.1.0
- OpenAL ==1.7.0.5
- openapi3 ==3.0.0.1
- openapi3 ==3.0.1.0
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
@ -1707,7 +1715,7 @@ default-package-overrides:
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.2.1
- partial-semigroup ==0.5.1.8
- password ==2.0.1.1
- password ==2.1.0.0
- password-instances ==2.0.0.1
- path ==0.7.0
- path-binary-instance ==0.1.0.1
@ -1736,6 +1744,7 @@ default-package-overrides:
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.10.5.3
- persistent-documentation ==0.1.0.2
- persistent-mtl ==0.2.0.0
- persistent-mysql ==2.10.2.3
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.10.1.2
@ -1748,6 +1757,7 @@ default-package-overrides:
- pg-transact ==0.3.1.1
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.2.0
- pipes ==4.3.14
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
@ -1954,7 +1964,7 @@ default-package-overrides:
- relude ==0.7.0.0
- renderable ==0.2.0.1
- replace-attoparsec ==1.4.2.0
- replace-megaparsec ==1.4.3.0
- replace-megaparsec ==1.4.4.0
- repline ==0.4.0.0
- req ==3.8.0
- req-conduit ==1.0.0
@ -2067,7 +2077,7 @@ default-package-overrides:
- servant-swagger ==1.1.10
- servant-swagger-ui ==0.3.4.3.37.2
- servant-swagger-ui-core ==0.3.4
- serverless-haskell ==0.12.4
- serverless-haskell ==0.12.5
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0
@ -2195,7 +2205,7 @@ default-package-overrides:
- streaming-bytestring ==0.2.0
- streaming-commons ==0.2.2.1
- streams ==3.3
- strict ==0.4
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.5
- strict-tuple ==0.1.4
@ -2239,6 +2249,7 @@ default-package-overrides:
- system-filepath ==0.4.14
- system-info ==0.5.1
- tabular ==0.2.2.8
- taffybar ==3.2.3
- tagchup ==0.4.1.1
- tagged ==0.8.6
- tagged-binary ==0.2.0.1
@ -2314,7 +2325,7 @@ default-package-overrides:
- text-zipper ==0.10.1
- tfp ==1.0.1.1
- tf-random ==0.5
- th-abstraction ==0.4.0.0
- th-abstraction ==0.4.1.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1
- th-constraint-compat ==0.0.1.0
@ -2348,7 +2359,7 @@ default-package-overrides:
- thyme ==0.3.5.5
- tidal ==1.6.1
- tile ==0.3.0.0
- time-compat ==1.9.4
- time-compat ==1.9.5
- timeit ==2.0
- timelens ==0.2.0.2
- time-lens ==0.4.0.2
@ -2459,7 +2470,7 @@ default-package-overrides:
- unordered-containers ==0.2.13.0
- unsafe ==0.0
- urbit-hob ==0.3.3
- uri-bytestring ==0.3.2.2
- uri-bytestring ==0.3.3.0
- uri-bytestring-aeson ==0.1.0.8
- uri-encode ==1.5.0.7
- url ==2.1.3
@ -2489,7 +2500,7 @@ default-package-overrides:
- vault ==0.3.1.4
- vec ==0.3
- vector ==0.12.1.2
- vector-algorithms ==0.8.0.3
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
@ -2497,7 +2508,7 @@ default-package-overrides:
- vector-instances ==3.4
- vector-mmap ==0.0.3
- vector-rotcev ==0.1.0.0
- vector-sized ==1.4.2
- vector-sized ==1.4.3
- vector-space ==0.16
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.7
@ -2516,7 +2527,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0
- wai-extra ==3.1.3
- wai-extra ==3.1.4.1
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
@ -2543,7 +2554,7 @@ default-package-overrides:
- webex-teams-pipes ==0.2.0.1
- webgear-server ==0.2.0
- webrtc-vad ==0.1.0.3
- websockets ==0.12.7.1
- websockets ==0.12.7.2
- websockets-snap ==0.10.3.1
- weigh ==0.0.16
- wide-word ==0.1.1.1
@ -2551,7 +2562,7 @@ default-package-overrides:
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.0.0.3
- witch ==0.0.0.4
- witherable-class ==0
- within ==0.2.0.1
- with-location ==0.1.0
@ -2616,6 +2627,8 @@ default-package-overrides:
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.0
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
@ -3392,6 +3405,7 @@ broken-packages:
- bbi
- BCMtools
- bcp47
- bcp47-orphans
- bdcs
- bdcs-api
- bdd
@ -3642,9 +3656,7 @@ broken-packages:
- broker-haskell
- bronyradiogermany-common
- bronyradiogermany-streaming
- brotli
- brotli-conduit
- brotli-streams
- browscap
- bsd-sysctl
- bson
@ -4223,6 +4235,7 @@ broken-packages:
- cookies
- coordinate
- copilot
- copilot-c99
- copilot-cbmc
- copilot-language
- copilot-libraries
@ -4312,7 +4325,6 @@ broken-packages:
- cryptocipher
- cryptocompare
- cryptoconditions
- cryptohash-sha512
- cryptoids
- cryptoids-class
- cryptoids-types
@ -4927,7 +4939,6 @@ broken-packages:
- EsounD
- espial
- ess
- essence-of-live-coding-warp
- estimators
- EstProgress
- estreps
@ -6390,7 +6401,6 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- hls-brittany
- hlwm
- hly
- hmark
@ -6440,7 +6450,6 @@ broken-packages:
- hogre
- hogre-examples
- hois
- hoist-error
- hol
- hold-em
- hole
@ -8508,7 +8517,6 @@ broken-packages:
- pandoc-filter-graphviz
- pandoc-filter-indent
- pandoc-include
- pandoc-include-code
- pandoc-japanese-filters
- pandoc-lens
- pandoc-markdown-ghci-filter
@ -8858,6 +8866,7 @@ broken-packages:
- postgresql-syntax
- postgresql-tx-query
- postgresql-tx-squeal
- postgresql-tx-squeal-compat-simple
- postgresql-typed-lifted
- postgrest
- postgrest-ws
@ -10446,6 +10455,7 @@ broken-packages:
- tds
- TeaHS
- teams
- techlab
- teeth
- telegram
- telegram-api

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

File diff suppressed because it is too large Load Diff

12
pkgs/development/haskell-modules/lib.nix
View File

@ -414,13 +414,13 @@ rec {
*/
generateOptparseApplicativeCompletion = exeName: pkg: overrideCabal pkg (drv: {
postInstall = (drv.postInstall or "") + ''
bashCompDir="$out/share/bash-completion/completions"
zshCompDir="$out/share/zsh/vendor-completions"
fishCompDir="$out/share/fish/vendor_completions.d"
bashCompDir="''${!outputBin}/share/bash-completion/completions"
zshCompDir="''${!outputBin}/share/zsh/vendor-completions"
fishCompDir="''${!outputBin}/share/fish/vendor_completions.d"
mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
"$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}"
"$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}"
"$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
"''${!outputBin}/bin/${exeName}" --bash-completion-script "''${!outputBin}/bin/${exeName}" >"$bashCompDir/${exeName}"
"''${!outputBin}/bin/${exeName}" --zsh-completion-script "''${!outputBin}/bin/${exeName}" >"$zshCompDir/_${exeName}"
"''${!outputBin}/bin/${exeName}" --fish-completion-script "''${!outputBin}/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
# Sanity check
grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || {

3
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -19,9 +19,10 @@ self: super: {
# HLS and its fork of ghcide that it uses
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { };
hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };

12
pkgs/development/ocaml-modules/biocaml/default.nix
View File

@ -4,25 +4,19 @@
buildDunePackage rec {
pname = "biocaml";
version = "0.10.1";
version = "0.11.1";
useDune2 = true;
minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "biocaml";
repo = pname;
rev = "v${version}";
sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj";
sha256 = "1il84vvypgkhdyc2j5fmgh14a58069s6ijbd5dvyl2i7jdxaazji";
};
# fix compilation without and disable -unsafe-string, needed for Ocaml 4.10:
patches = [ (fetchpatch {
url = "https://github.com/biocaml/biocaml/commit/597fa7b0d203684e45ffe03f56c74335b6173ffc.patch";
sha256 = "0b8jdg215cv2k4y3ww7vak2ag5v6v9w8b76qjivr5d1qxz47mqxv";
}) ];
buildInputs = [ ppx_jane ppx_sexp_conv ];
checkInputs = [ ounit ];
propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ];

13
pkgs/development/ocaml-modules/bistro/default.nix
View File

@ -15,15 +15,22 @@ buildDunePackage rec {
sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38";
};
patches = [
# The following patch adds support for core.v0.13
patches = [(fetchpatch {
(fetchpatch {
url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch";
sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd";
})];
})
# The following patch adds support for core.v0.14
(fetchpatch {
url = "https://github.com/pveber/bistro/commit/afbdcb2af7777ef7711c7f3c45dff605350a27b2.patch";
sha256 = "0ix6lx9qjnn3vqp0164c6l5an8b4rq69h2mxrg89piyk2g1yv0zg";
})
];
propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ];
minimumOCamlVersion = "4.07";
minimumOCamlVersion = "4.08";
meta = {
inherit (src.meta) homepage;

2
pkgs/development/ocaml-modules/cfstream/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "cfstream";
version = "1.3.1";
useDune2 = true;
minimumOCamlVersion = "4.04.1";
src = fetchFromGitHub {

601
pkgs/development/ocaml-modules/janestreet/0.13.nix
View File

@ -1,601 +0,0 @@
{ janePackage
, ctypes
, dune-configurator
, num
, octavius
, ppxlib
, re
, openssl
, zarith
}:
rec {
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";
version = "0.12.1";
hash = "0hpk54fcsfcjp536fgwr80mjjf88hjk58q7jwnyrhk2ljd8xzgiv";
meta.description = "OCaml compiler libraries repackaged";
};
sexplib0 = janePackage {
pname = "sexplib0";
hash = "1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y";
meta.description = "Library containing the definition of S-expressions and some base converters";
};
base = janePackage {
pname = "base";
version = "0.13.1";
hash = "08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw";
meta.description = "Full standard library replacement for OCaml";
propagatedBuildInputs = [ sexplib0 ];
};
stdio = janePackage {
pname = "stdio";
hash = "1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh";
meta.description = "Standard IO library for OCaml";
propagatedBuildInputs = [ base ];
};
ppx_sexp_conv = janePackage {
pname = "ppx_sexp_conv";
hash = "0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf";
meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
propagatedBuildInputs = [ ppxlib ];
};
ppx_here = janePackage {
pname = "ppx_here";
hash = "1ahidrrjsyi0al06bhv5h6aqmdk7ryz8dybfhqjsn1zp9q056q35";
meta.description = "Expands [%here] into its location";
propagatedBuildInputs = [ ppxlib ];
};
ppx_compare = janePackage {
pname = "ppx_compare";
hash = "14pnqa47gsvq93z1b8wb5pyq8zw90aaw71j4pwlyid4s86px454j";
meta.description = "Generation of comparison functions from types";
propagatedBuildInputs = [ ppxlib ];
};
ppx_cold = janePackage {
pname = "ppx_cold";
hash = "0wnfwsgbzk4i5aqjlcaqp6lkvrq5345vazryvx2klbbrd4759h9f";
meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]";
propagatedBuildInputs = [ ppxlib ];
};
ppx_assert = janePackage {
pname = "ppx_assert";
hash = "08dada2xcp3w5mir90z56qrdyd317lygml4qlfssj897534bwiqr";
meta.description = "Assert-like extension nodes that raise useful errors on failure";
propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ];
};
ppx_inline_test = janePackage {
pname = "ppx_inline_test";
hash = "135qzbhqy33lmigbq1rakr9i3y59y3pczh4laanqjyss9b9kfs60";
meta.description = "Syntax extension for writing in-line tests in ocaml code";
propagatedBuildInputs = [ ppxlib ];
};
ppx_custom_printf = janePackage {
pname = "ppx_custom_printf";
hash = "0kvfkdk4wg2z8x705bajvl1f8wiyy3aya203wdzc9425h73nqm5p";
meta.description = "Printf-style format-strings for user-defined string conversion";
propagatedBuildInputs = [ ppx_sexp_conv ];
};
fieldslib = janePackage {
pname = "fieldslib";
hash = "0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa";
meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
propagatedBuildInputs = [ base ];
};
ppx_fields_conv = janePackage {
pname = "ppx_fields_conv";
hash = "0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4";
meta.description = "Generation of accessor and iteration functions for ocaml records";
propagatedBuildInputs = [ fieldslib ppxlib ];
};
variantslib = janePackage {
pname = "variantslib";
hash = "04nps65v1n0nv9n1c1kj5k9jyqsfsxb6h2w3vf6cibhjr5m7z8xc";
meta.description = "Part of Jane Street's Core library";
propagatedBuildInputs = [ base ];
};
ppx_variants_conv = janePackage {
pname = "ppx_variants_conv";
hash = "1ssinizz11bws06qzjky486cj1zrflij1f7hi16d02j40qmyjz7b";
meta.description = "Generation of accessor and iteration functions for ocaml variant types";
propagatedBuildInputs = [ variantslib ppxlib ];
};
ppx_expect = janePackage {
pname = "ppx_expect";
hash = "1hhcga960wjvhcx5pk7rcywl1p9n2ycvqa294n24m8dhzqia6i47";
meta.description = "Cram like framework for OCaml";
propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ];
};
ppx_enumerate = janePackage {
pname = "ppx_enumerate";
hash = "0hsg6f2nra1mb35jdgym5rf7spm642bs6qqifbikm9hg8f7z3ql4";
meta.description = "Generate a list containing all values of a finite type";
propagatedBuildInputs = [ ppxlib ];
};
ppx_hash = janePackage {
pname = "ppx_hash";
hash = "1f7mfyx4wgk67hchi57w3142m61ka3vgy1969cbkwr3akv6ifly2";
meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
};
ppx_js_style = janePackage {
pname = "ppx_js_style";
hash = "1zlhcn0an5k9xjymk5z5m2vqi8zajy6nvcbl5sdn19pjl3zv645x";
meta.description = "Code style checker for Jane Street Packages";
propagatedBuildInputs = [ octavius ppxlib ];
};
ppx_base = janePackage {
pname = "ppx_base";
hash = "0dkqc85x7bgbb6lgx9rghvj1q4dpdgy9qgjl88ywi4c8l9rgnnkz";
meta.description = "Base set of ppx rewriters";
propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
};
ppx_bench = janePackage {
pname = "ppx_bench";
hash = "0snmy05d3jgihmppixx3dzamkykijqa2v43vpd7q4z8dpnip620g";
meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
propagatedBuildInputs = [ ppx_inline_test ];
};
ppx_sexp_message = janePackage {
pname = "ppx_sexp_message";
hash = "03jhx3ajcv22iwxkg1jf1jjvd14gyrwi1yc6c5ryqi5ha0fywfw6";
meta.description = "A ppx rewriter for easy construction of s-expressions";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
};
splittable_random = janePackage {
pname = "splittable_random";
hash = "1kgcd6k31vsd7638g8ip77bp1b7vzgkbvgvij4jm2igl09132r85";
meta.description = "PRNG that can be split into independent streams";
propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ];
};
ppx_let = janePackage {
pname = "ppx_let";
hash = "0qplsvbv10h7kwf6dhhgvi001gfphv1v66s83zjr5zbypyaarg5y";
meta.description = "Monadic let-bindings";
propagatedBuildInputs = [ ppxlib ];
};
base_quickcheck = janePackage {
pname = "base_quickcheck";
hash = "0ik8llm01m2xap4gia0vpsh7yq311hph7a2kf5109ag4988s8p0w";
meta.description = "Randomized testing framework, designed for compatibility with Base";
propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ];
};
ppx_stable = janePackage {
pname = "ppx_stable";
hash = "0h7ls1bs0bsd8c4na4aj0nawwhvfy50ybm7sza7yz3qli9jammjk";
meta.description = "Stable types conversions generator";
propagatedBuildInputs = [ ppxlib ];
};
bin_prot = janePackage {
pname = "bin_prot";
hash = "1nnr21rljlfglmhiji27d7c1d6gg5fk4cc5rl3750m98w28mfdjw";
meta.description = "A binary protocol generator";
propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
};
ppx_bin_prot = janePackage {
pname = "ppx_bin_prot";
hash = "14nfjgqisdqqg8wg4qzvc859zil82y0qpr8fm4nhq05mgxp37iyc";
meta.description = "Generation of bin_prot readers and writers from types";
propagatedBuildInputs = [ bin_prot ppx_here ];
};
ppx_fail = janePackage {
pname = "ppx_fail";
hash = "165mikjg4a1lahq3n9q9y2h36jbln5g3l2hapx17irvf0l0c3vn5";
meta.description = "Add location to calls to failwiths";
propagatedBuildInputs = [ ppx_here ];
};
jst-config = janePackage {
pname = "jst-config";
hash = "15lj6f83hz555xhjy9aayl3adqwgl1blcjnja693a1ybi3ca8w0y";
meta.description = "Compile-time configuration for Jane Street libraries";
buildInputs = [ ppx_assert ];
};
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
hash = "13db395swqf7v87pgl9qiyj4igmvj57hpl8blx3kkrzj6ddh38a8";
meta.description = "Optional compilation for OCaml";
propagatedBuildInputs = [ ppxlib ];
};
jane-street-headers = janePackage {
pname = "jane-street-headers";
hash = "1qjg2ari0xn40dlbk0h9xkwr37k97ldkxpkv792fbl6wc2jlv3x5";
meta.description = "Jane Street C header files";
};
time_now = janePackage {
pname = "time_now";
hash = "1if234kz1ssmv22c0vh1cwhbivab6yy3xvy37ny1q4k5ibjc3v0n";
meta.description = "Reports the current time";
buildInputs = [ jst-config ppx_optcomp ];
propagatedBuildInputs = [ jane-street-headers base ppx_base ];
};
ppx_module_timer = janePackage {
pname = "ppx_module_timer";
hash = "13kv5fzwf41wsaksj41hnvcpx8pnbmzcainlq6f5shj9671hpnhb";
meta.description = "Ppx rewriter that records top-level module startup times";
propagatedBuildInputs = [ time_now ];
};
ppx_optional = janePackage {
pname = "ppx_optional";
hash = "1nwb9jvmszxddj9wxgv9g02qhr10yymm2q1w1gjfqd97m2m1mx4n";
meta.description = "Pattern matching on flat options";
propagatedBuildInputs = [ ppxlib ];
};
ppx_pipebang = janePackage {
pname = "ppx_pipebang";
hash = "0ybj0flsi95pf13ayzz1lcrqhqvkv1lm2dz6y8w49f12583496mc";
meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
propagatedBuildInputs = [ ppxlib ];
};
ppx_sexp_value = janePackage {
pname = "ppx_sexp_value";
hash = "18k5015awv9yjl44cvdmp3pn894cgsxmn5s7picxapm9675xqcg9";
meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
};
typerep = janePackage {
pname = "typerep";
hash = "116hlifww2cqq1i9vwpl7ziwkc1na7p9icqi9srpdxnvn8ibcsas";
meta.description = "Typerep is a library for runtime types";
propagatedBuildInputs = [ base ];
};
ppx_typerep_conv = janePackage {
pname = "ppx_typerep_conv";
hash = "1jlmga9i79inr412l19n4vvmgafzp1bznqxwhy42x309wblbhxx9";
meta.description = "Generation of runtime types from type declarations";
propagatedBuildInputs = [ ppxlib typerep ];
};
ppx_jane = janePackage {
pname = "ppx_jane";
hash = "1a86rvnry8lvjhsg2k73f5bgz7l2962k5i49yzmzn8w66kj0yz60";
meta.description = "Standard Jane Street ppx rewriters";
propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ];
};
base_bigstring = janePackage {
pname = "base_bigstring";
hash = "1i3zr8bn71l442vl5rrvjpwphx20frp2vaw1qc05d348j76sxfp7";
meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
propagatedBuildInputs = [ ppx_jane ];
};
parsexp = janePackage {
pname = "parsexp";
hash = "0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38";
meta.description = "S-expression parsing library";
propagatedBuildInputs = [ base sexplib0 ];
};
sexplib = janePackage {
pname = "sexplib";
hash = "059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn";
meta.description = "Library for serializing OCaml values to and from S-expressions";
propagatedBuildInputs = [ num parsexp ];
};
core_kernel = janePackage {
version = "0.13.1";
pname = "core_kernel";
hash = "1ynyz6jkf23q0cwbn6kv06mgyjd644qxb0qkrydq0cglcaa4kjhp";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ base_bigstring sexplib ];
};
spawn = janePackage {
pname = "spawn";
hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
meta.description = "Spawning sub-processes";
buildInputs = [ ppx_expect ];
};
core = janePackage {
pname = "core";
hash = "1i5z9myl6i7axd8dz4b71gdsz9la6k07ib9njr4bn12yn0y76b1m";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ core_kernel spawn ];
};
async_kernel = janePackage {
pname = "async_kernel";
hash = "1rrbyy3pyh31qwv0jiarhpgdyq2z2gx6axmaplgpxshk4qx6gsld";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ core_kernel ];
};
protocol_version_header = janePackage {
pname = "protocol_version_header";
hash = "19wscd81jlj355f9din1sg21m3af456a0id2a37bx38r390wrghc";
meta.description = "Protocol versioning";
propagatedBuildInputs = [ core_kernel ];
};
async_rpc_kernel = janePackage {
pname = "async_rpc_kernel";
hash = "1k3f2psyd1xcf7nkk0q1fq57yyhfqbzyynsz821n7mrnm37simac";
meta.description = "Platform-independent core of Async RPC library";
propagatedBuildInputs = [ async_kernel protocol_version_header ];
};
async_unix = janePackage {
pname = "async_unix";
version = "0.13.1";
hash = "1sb8grbj4bv6ih3yfdihxhn5c9rqczr56b5bhl85wy2mi92m17xv";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_kernel core ];
};
async_extra = janePackage {
pname = "async_extra";
hash = "06q1farx7dwi4h490xi1azq7ym57ih2d23sq17g2jfvw889kf4n1";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_rpc_kernel async_unix ];
};
textutils = janePackage {
pname = "textutils";
hash = "1wnyqj9dzfgl0kddmdl4n9rkl16hwy432dd2i4ksvk2z5g9kkb0d";
meta.description = "Text output utilities";
propagatedBuildInputs = [ core ];
};
async = janePackage {
pname = "async";
hash = "002j9yxpw0ghi12a84163vaqa3n9h8j35f4i72nbxnilxwvy95sr";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ];
};
async_find = janePackage {
pname = "async_find";
hash = "0l8cfhyrx2rb2avdcfx5m70aj6rx2d57qxqvfycad5afqz4xx2n9";
meta.description = "Directory traversal with Async";
propagatedBuildInputs = [ async ];
};
async_interactive = janePackage {
pname = "async_interactive";
hash = "1ma24pi3hqzrs1k12sc0aarhf42fap8nl1h7id6k01wp6s3yqi5d";
meta.description = "Utilities for building simple command-line based user interfaces";
propagatedBuildInputs = [ async ];
};
re2 = janePackage {
pname = "re2";
hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0";
meta.description = "OCaml bindings for RE2, Google's regular expression library";
propagatedBuildInputs = [ core_kernel ];
prePatch = ''
substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
'';
};
shell = janePackage {
pname = "shell";
hash = "190ymhm0z9b7hngbcpg88wwrfxwfcdh339d7rd2xhmrhi4z99r18";
meta.description = "Yet another implementation of fork&exec and related functionality";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ re2 textutils ];
};
async_shell = janePackage {
pname = "async_shell";
hash = "0bfxyvdmyv23zfr49pb4c3bgfkjr4s3nb3z07xrw6szia3j1kp4j";
meta.description = "Shell helpers for Async";
propagatedBuildInputs = [ async shell ];
};
async_ssl = janePackage {
pname = "async_ssl";
useDune2 = true;
hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k";
meta.description = "Async wrappers for SSL";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ async ctypes openssl ];
};
core_bench = janePackage {
pname = "core_bench";
hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm";
meta.description = "Benchmarking library";
propagatedBuildInputs = [ textutils ];
};
core_extended = janePackage {
pname = "core_extended";
hash = "0zh1wwkg5cxkz633dl9zbbl65aksvzb5mss1q8f7w6i1sv3n0135";
meta.description = "Extra components that are not as closely vetted or as stable as Core";
propagatedBuildInputs = [ core ];
};
sexp_pretty = janePackage {
pname = "sexp_pretty";
hash = "1a59xc9frmvi7n0i32dzs8gpf5ral80xkwv97a13zv5cyg8l6216";
meta.description = "S-expression pretty-printer";
propagatedBuildInputs = [ ppx_base re sexplib ];
};
expect_test_helpers_kernel = janePackage {
pname = "expect_test_helpers_kernel";
hash = "11m0i7mj6b1cmqnwhmsrqdc814s0lk3sip8rh97k75grngazmjvn";
meta.description = "Helpers for writing expectation tests";
buildInputs = [ ppx_jane ];
propagatedBuildInputs = [ core_kernel sexp_pretty ];
};
expect_test_helpers = janePackage {
pname = "expect_test_helpers";
hash = "0sw9yam8d9hdam8p194q0hgc4i26vvwj5qi2cba1jxfhdzhy8jdd";
meta.description = "Async helpers for writing expectation tests";
propagatedBuildInputs = [ async expect_test_helpers_kernel ];
};
patience_diff = janePackage {
pname = "patience_diff";
hash = "012rlbnw21yq2lsbfk3f7l4m4qq3jdx238146z36v54vnhhs6r2r";
meta.description = "Diff library using Bram Cohen's patience diff algorithm";
propagatedBuildInputs = [ core_kernel ];
};
ecaml = janePackage {
pname = "ecaml";
hash = "0jmmsi1m7d4cl5mnw6v9h4ng29anwxy73a6qfi28lgpzafn452bc";
meta.description = "Library for writing Emacs plugin in OCaml";
propagatedBuildInputs = [ async expect_test_helpers_kernel ];
};
posixat = janePackage {
pname = "posixat";
hash = "122fmd6v7fhiiivkxra539b5w3p5xkkd8mcjzvyb2msyq5zc6xa2";
propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ];
meta.description = "Binding to the posix *at functions";
};
shexp = janePackage {
pname = "shexp";
hash = "0zdcyix0gdn4xmvbjzhbig63xw9jnw8ixj3ngs6g4k2vk77rs0gk";
propagatedBuildInputs = [ posixat spawn ];
meta.description = "Process library and s-expression based shell";
};
csvfields = janePackage {
pname = "csvfields";
hash = "19pnq9m9lkdgqfy9l21w779d6c8djr1dvvjq7r9kbgfwb04symmr";
propagatedBuildInputs = [ core expect_test_helpers ];
meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
};
sexp_diff_kernel = janePackage {
pname = "sexp_diff_kernel";
hash = "125gssd24vfcfbkpjlqbxijlc4jyw2n0wv1cnddcfvpn1f7cghzb";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Code for computing the diff of two sexps";
};
sexp_macro = janePackage {
pname = "sexp_macro";
hash = "1rqs2r2ihwsqzgnqsdr0db6dqzz4q6s9hi1hvnwf0cb2vnkhsjln";
propagatedBuildInputs = [ async sexplib ];
meta.description = "Sexp macros";
};
sexp_select = janePackage {
pname = "sexp_select";
hash = "02yckmin937scqs2i45r2qqp56rqa6j2q04nfhnnxvn3bkb0qnb1";
propagatedBuildInputs = [ base ppx_jane ];
meta.description = "A library to use CSS-style selectors to traverse sexp trees";
};
sexp = janePackage {
pname = "sexp";
hash = "0cqp6syc4ap2nxgg1mvwwz2pmib48kp3gigzpjwh20wr38qq0p1r";
propagatedBuildInputs = [
async
core
csvfields
re2
sexp_diff_kernel
sexp_macro
sexp_pretty
sexp_select
];
patches = ./sexp.patch;
meta.description = "S-expression swiss knife";
};
zarith_stubs_js = janePackage {
pname = "zarith_stubs_js";
hash = "0dldnf85rfyx8z63qjly9n8plj8nnkw4i5zrj5vbm7s2wjcfjzj1";
meta.description = "Javascripts stubs for the Zarith library";
};
bignum = janePackage {
pname = "bignum";
hash = "0qldyl5mhlffnyps7n9y8qykm0ylrdiw5ii8zlww82zmmpp8zv5x";
propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ];
meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
};
delimited_parsing = janePackage {
pname = "delimited_parsing";
hash = "0siz746q28241wk0sv435lfvvips7sl151z5a1sbqanr3lm4s17w";
propagatedBuildInputs = [ async core_extended ];
meta.description = "Parsing of character (e.g., comma) separated and fixed-width values";
};
### Packages at version 0.11, with dependencies at version 0.12
configurator = janePackage {
pname = "configurator";
version = "0.11.0";
hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk";
propagatedBuildInputs = [ stdio ];
meta.description = "Helper library for gathering system configuration";
};
ppx_core = janePackage {
pname = "ppx_core";
version = "0.11.0";
hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
ppx_driver = janePackage {
pname = "ppx_driver";
version = "0.11.0";
hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
ppx_type_conv = janePackage {
pname = "ppx_type_conv";
version = "0.11.0";
hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
}

857
pkgs/development/ocaml-modules/janestreet/0.14.nix Normal file
View File

@ -0,0 +1,857 @@
{ janePackage
, alcotest
, angstrom
, angstrom-async
, base64
, cryptokit
, ctypes
, dune-configurator
, faraday
, inotify
, js_of_ocaml
, js_of_ocaml-ppx
, lambdasoup
, magic-mime
, num
, octavius
, ppxlib
, re
, tyxml
, uri-sexp
, zarith
, openssl
, ounit
, zstd
}:
rec {
accessor = janePackage {
pname = "accessor";
version = "0.14.1";
minimumOCamlVersion = "4.09";
hash = "0wm2081kzd5zsqs516cn3f975bnnmnyynv8fa818gmfa65i6mxm8";
meta.description = "A library that makes it nicer to work with nested functional data structures";
propagatedBuildInputs = [ higher_kinded ];
};
accessor_async = janePackage {
pname = "accessor_async";
version = "0.14.1";
minimumOCamlVersion = "4.09";
hash = "1193hzvlzm7vcl9p67fs8al2pvkw9n2wz009m2l3lp35mrx8aq1w";
meta.description = "Accessors for Async types, for use with the Accessor library";
propagatedBuildInputs = [ accessor_core async_kernel ];
};
accessor_base = janePackage {
pname = "accessor_base";
version = "0.14.1";
minimumOCamlVersion = "4.09";
hash = "1xjbvvijkyw4dlys47x4896y3kqm2zn0yg60cqrp57i2dwxg0nsj";
meta.description = "Accessors for Base types, for use with the Accessor library";
propagatedBuildInputs = [ ppx_accessor ];
};
accessor_core = janePackage {
minimumOCamlVersion = "4.09";
pname = "accessor_core";
version = "0.14.1";
hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2";
meta.description = "Accessors for Core types, for use with the Accessor library";
propagatedBuildInputs = [ accessor_base core_kernel ];
};
async = janePackage {
pname = "async";
hash = "086v93div4h9l02n7wzv3xx3i6xvddazydm9qlfa72ad55x3vzy0";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ];
doCheck = false; # we don't have netkit_sockets
};
async_extra = janePackage {
pname = "async_extra";
hash = "16cnz9h4jkc3b0837s5z0iv92q7n5nw77g8qshq8pwq639y8ail4";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_kernel ];
};
async_find = janePackage {
pname = "async_find";
hash = "0vlcpdr15bgrwrmixvs6ij88kvk8vzzrijz3zm0svxih0naf8ylx";
meta.description = "Directory traversal with Async";
propagatedBuildInputs = [ async ];
};
async_inotify = janePackage {
pname = "async_inotify";
hash = "0i0hf7nsir316ijixdj43qf0p3b6yapvcm2jzp7bhpf4r2kxislv";
meta.description = "Async wrapper for inotify";
propagatedBuildInputs = [ async_find inotify ];
};
async_interactive = janePackage {
pname = "async_interactive";
hash = "1cnmv9mipa6k6xd303ngdbxmiab2202f3w3pgq8l1970w8hb78il";
meta.description = "Utilities for building simple command-line based user interfaces";
propagatedBuildInputs = [ async ];
};
async_js = janePackage {
pname = "async_js";
hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v";
meta.description = "A small library that provide Async support for JavaScript platforms";
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ];
};
async_kernel = janePackage {
pname = "async_kernel";
hash = "17giakwl0xhyxvxrkn12dwjdghc53q8px81z7cc3k6f102bsbdy6";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ core_kernel ];
};
async_rpc_kernel = janePackage {
pname = "async_rpc_kernel";
hash = "1bwq3gkq057dd1fhrqz9kqq8a956nn87zaxvr0qcpiczzjv3zmvm";
meta.description = "Platform-independent core of Async RPC library";
propagatedBuildInputs = [ async_kernel protocol_version_header ];
};
async_sendfile = janePackage {
pname = "async_sendfile";
hash = "1w3gwwpgfzqjhblxnxh64g64q6kgjzzxx90inswfhycc88pnvdna";
meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files";
propagatedBuildInputs = [ async_unix ];
};
async_shell = janePackage {
pname = "async_shell";
hash = "1r00z620nqv2jxz2xrp2gsyc30h8dd2w9qsnys2fkqbgpxlbgdc7";
meta.description = "Shell helpers for Async";
propagatedBuildInputs = [ async shell ];
};
async_smtp = janePackage {
pname = "async_smtp";
hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck";
meta.description = "SMTP client and server";
propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ];
};
async_ssl = janePackage {
pname = "async_ssl";
hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy";
meta.description = "Async wrappers for SSL";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ async ctypes openssl ];
};
async_unix = janePackage {
pname = "async_unix";
hash = "1wgnr0vdsknqrfnf6irmwnvyngndsnvvl1sfnj3v6fhwk4nswnrs";
meta.description = "Monadic concurrency library";
propagatedBuildInputs = [ async_kernel core ];
};
base = janePackage {
pname = "base";
hash = "1d5ynzzq58g9qammhba5dasrg734p9vndq28a7kg80bdxb8gh3kp";
minimumOCamlVersion = "4.07";
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ sexplib0 ];
checkInputs = [ alcotest ];
};
base_bigstring = janePackage {
pname = "base_bigstring";
hash = "1ald2m7qywhxbygv58dzpgaj54p38zn0aiqd1z7i95kf3bsnsjqa";
minimumOCamlVersion = "4.07";
meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
propagatedBuildInputs = [ ppx_jane ];
};
base_quickcheck = janePackage {
pname = "base_quickcheck";
hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j";
minimumOCamlVersion = "4.04.2";
meta.description = "Randomized testing framework, designed for compatibility with Base";
propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ];
};
bignum = janePackage {
pname = "bignum";
hash = "009ygr64q810p9iq4mykzz4ci00i5mzgpmq35jiyaiqm27bjam21";
propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ];
meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
};
bin_prot = janePackage {
pname = "bin_prot";
hash = "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr";
minimumOCamlVersion = "4.04.2";
meta.description = "A binary protocol generator";
propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_variants_conv ];
};
bonsai = janePackage {
pname = "bonsai";
hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a";
meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
buildInputs = [ ppx_pattern_bind ];
propagatedBuildInputs = [ incr_dom ];
};
cinaps = janePackage {
pname = "cinaps";
hash = "0ms1j2kh7i5slyw9v4w9kdz52dkwl5gqcnvn89prgimhk2vmichj";
minimumOCamlVersion = "4.07";
meta.description = "Trivial metaprogramming tool";
propagatedBuildInputs = [ re ];
checkInputs = [ ppx_jane ];
};
core = janePackage {
pname = "core";
hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ core_kernel spawn timezone ];
doCheck = false; # we don't have quickcheck_deprecated
};
core_bench = janePackage {
pname = "core_bench";
hash = "04h6hzxk347pqyrrbgqrw9576sq4yf70fgq9xam3kajrqwdh3dhx";
meta.description = "Benchmarking library";
propagatedBuildInputs = [ textutils ];
};
core_extended = janePackage {
pname = "core_extended";
hash = "1pbm6xbc3h0fhrymyr1yb9b1jk7n88gfi3pylqz2cs8haxr2pb3a";
meta.description = "Extra components that are not as closely vetted or as stable as Core";
propagatedBuildInputs = [ core ];
};
core_kernel = janePackage {
pname = "core_kernel";
hash = "012sp02v35j41lzkvf073620602fgiswz2n224j06mk3bm8jmjms";
meta.description = "System-independent part of Core";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ base_bigstring sexplib ];
doCheck = false; # we don't have quickcheck_deprecated
};
csvfields = janePackage {
pname = "csvfields";
hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz";
propagatedBuildInputs = [ core num ];
meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
};
delimited_parsing = janePackage {
pname = "delimited_parsing";
hash = "1dnr5wqacryx1kj38i9iifc3457pchr887xphzz2nhlbizq3d7qa";
propagatedBuildInputs = [ async core_extended ];
meta.description = "Parsing of character (e.g., comma) separated and fixed-width values";
};
ecaml = janePackage {
pname = "ecaml";
hash = "052qglpwzrx3c4gy3zr6dmsmfbi5gj4fs2jhx9yrsqb9hj8g36mj";
meta.description = "Library for writing Emacs plugin in OCaml";
propagatedBuildInputs = [ async expect_test_helpers_core ];
};
email_message = janePackage {
pname = "email_message";
hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n";
meta.description = "E-mail message parser";
propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ];
};
expect_test_helpers_async = janePackage {
pname = "expect_test_helpers_async";
hash = "175sjkx3b10d8vacp369rv53nxbiaxw1xhwy832g7ffk1by8l2m1";
meta.description = "Async helpers for writing expectation tests";
propagatedBuildInputs = [ async expect_test_helpers_core ];
};
expect_test_helpers_core = janePackage {
pname = "expect_test_helpers_core";
hash = "1drl15akp4jz4wf26dr2y2nblvnhz14xsnb3ai8dg45y711svs2i";
meta.description = "Helpers for writing expectation tests";
propagatedBuildInputs = [ core_kernel sexp_pretty ];
};
fieldslib = janePackage {
pname = "fieldslib";
hash = "0nxx35lrb4f6zfs5l80a7cg7azf19c6g31vn9qjjpaxf6lgkck2n";
minimumOCamlVersion = "4.04.2";
meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
propagatedBuildInputs = [ base ];
};
higher_kinded = janePackage {
pname = "higher_kinded";
version = "0.14.1";
minimumOCamlVersion = "4.09";
hash = "05jvxgqsx3j2v8rqpd91ah76dgc1q2dz38kjklmx0vms4r4gvlsx";
meta.description = "A library with an encoding of higher kinded types in OCaml";
propagatedBuildInputs = [ base ppx_jane ];
};
incr_dom = janePackage {
pname = "incr_dom";
hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx";
meta.description = "A library for building dynamic webapps, using Js_of_ocaml";
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ];
};
incr_map = janePackage {
pname = "incr_map";
hash = "0s0s7qfydvvvnqby4v5by5jdnd5kxqsdr65mhm11w4fn125skryz";
meta.description = "Helpers for incremental operations on map like data structures";
buildInputs = [ ppx_pattern_bind ];
propagatedBuildInputs = [ incremental ];
};
incr_select = janePackage {
pname = "incr_select";
hash = "18ril6z57mw89gzc9zhz6p1phwm1xr6phppicvqpqmi0skvvnrg6";
meta.description = "Handling of large set of incremental outputs from a single input";
propagatedBuildInputs = [ incremental ];
};
incremental = janePackage {
pname = "incremental";
hash = "0nyaiy7r2spvn2ij9z5rghd5gbjk1y3ai4jn0i8q81arp7cf6zc7";
meta.description = "Library for incremental computations";
propagatedBuildInputs = [ core_kernel ];
};
jane-street-headers = janePackage {
pname = "jane-street-headers";
hash = "12n40mlgjnc09fxc0hp0npsxdlxja2w828683zpb32nrzqkg6z4c";
minimumOCamlVersion = "4.04.2";
meta.description = "Jane Street C header files";
};
jst-config = janePackage {
pname = "jst-config";
hash = "0hzw0crgj0kjxsvr10wng7gqy948v98hnijh30lgq3v62jdsjra8";
meta.description = "Compile-time configuration for Jane Street libraries";
buildInputs = [ dune-configurator ppx_assert stdio ];
};
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";
version = "0.12.3";
minimumOCamlVersion = "4.04.1";
hash = "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5";
meta.description = "OCaml compiler libraries repackaged";
};
parsexp = janePackage {
pname = "parsexp";
hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd";
minimumOCamlVersion = "4.04.2";
meta.description = "S-expression parsing library";
propagatedBuildInputs = [ base sexplib0 ];
};
patience_diff = janePackage {
pname = "patience_diff";
hash = "1np88s226ndhbwynpdqygrycahp8m1mx28f1xk54kvds8znnq2i0";
meta.description = "Diff library using Bram Cohen's patience diff algorithm";
propagatedBuildInputs = [ core_kernel ];
};
posixat = janePackage {
pname = "posixat";
hash = "0aana1lzq4514kna7hr301b5iv6gcg6zhgrx8s8vaad1q38yfp6c";
minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ];
meta.description = "Binding to the posix *at functions";
};
ppx_accessor = janePackage {
pname = "ppx_accessor";
version = "0.14.2";
minimumOCamlVersion = "4.09";
hash = "01nifsh7gap28cpvff6i569lqr1gmyhrklkisgri538cp4pf1wq1";
meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries";
propagatedBuildInputs = [ accessor ];
};
ppx_assert = janePackage {
pname = "ppx_assert";
hash = "03mzgm4smrczp5dg3mpr6zc2v6a54n0r01k4ww820yrr25hcf8ip";
minimumOCamlVersion = "4.04.2";
meta.description = "Assert-like extension nodes that raise useful errors on failure";
propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ];
};
ppx_base = janePackage {
pname = "ppx_base";
hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000";
minimumOCamlVersion = "4.04.2";
meta.description = "Base set of ppx rewriters";
propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ];
};
ppx_bench = janePackage {
pname = "ppx_bench";
version = "0.14.1";
hash = "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im";
minimumOCamlVersion = "4.04.2";
meta.description = "Syntax extension for writing in-line benchmarks in ocaml code";
propagatedBuildInputs = [ ppx_inline_test ];
};
ppx_bin_prot = janePackage {
pname = "ppx_bin_prot";
hash = "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg";
minimumOCamlVersion = "4.04.2";
meta.description = "Generation of bin_prot readers and writers from types";
propagatedBuildInputs = [ bin_prot ppx_here ];
doCheck = false; # circular dependency with ppx_jane
};
ppx_cold = janePackage {
pname = "ppx_cold";
hash = "0ciqs6f9ab73gq4krj14xzzba4ydcxph214m87i1s0xp25hwxr8v";
minimumOCamlVersion = "4.04.2";
meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]";
propagatedBuildInputs = [ ppxlib ];
};
ppx_compare = janePackage {
pname = "ppx_compare";
hash = "11pj76dimx2f7l8m85myzp6yzx9xcg0bqi97s7ayssvkckm57390";
minimumOCamlVersion = "4.04.2";
meta.description = "Generation of comparison functions from types";
propagatedBuildInputs = [ ppxlib base ];
doCheck = false; # test build rule broken
};
ppx_custom_printf = janePackage {
pname = "ppx_custom_printf";
hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5";
minimumOCamlVersion = "4.04.2";
meta.description = "Printf-style format-strings for user-defined string conversion";
propagatedBuildInputs = [ ppx_sexp_conv ];
};
ppx_enumerate = janePackage {
pname = "ppx_enumerate";
hash = "1sriid4vh10p80wwvn46v1g16m646qw5r5xzwlymyz5gbvq2zf40";
minimumOCamlVersion = "4.04.2";
meta.description = "Generate a list containing all values of a finite type";
propagatedBuildInputs = [ ppxlib ];
};
ppx_expect = janePackage {
pname = "ppx_expect";
hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn";
minimumOCamlVersion = "4.04.2";
meta.description = "Cram like framework for OCaml";
propagatedBuildInputs = [ ppx_here ppx_inline_test re ];
doCheck = false; # circular dependency with ppx_jane
};
ppx_fields_conv = janePackage {
pname = "ppx_fields_conv";
version = "0.14.2";
hash = "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8";
minimumOCamlVersion = "4.04.2";
meta.description = "Generation of accessor and iteration functions for ocaml records";
propagatedBuildInputs = [ fieldslib ppxlib ];
};
ppx_fixed_literal = janePackage {
pname = "ppx_fixed_literal";
hash = "0s7rb4dhz4ibhh42a9sfxjj3zbwfyfmaihr92hpdv5j9xqn3n8mi";
minimumOCamlVersion = "4.04.2";
meta.description = "Simpler notation for fixed point literals";
propagatedBuildInputs = [ ppxlib ];
};
ppx_hash = janePackage {
pname = "ppx_hash";
hash = "1zf03xdrg4jig7pdcrdpbabyjkdpifb31z2z1bf9wfdawybdhwkq";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
};
ppx_here = janePackage {
pname = "ppx_here";
hash = "09zcyigaalqccs9s0h7n0535clgfmqb9s4p1jbgcqji9zj8w426s";
minimumOCamlVersion = "4.04.2";
meta.description = "Expands [%here] into its location";
propagatedBuildInputs = [ ppxlib ];
doCheck = false; # test build rules broken
};
ppx_inline_test = janePackage {
pname = "ppx_inline_test";
version = "0.14.1";
hash = "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4";
minimumOCamlVersion = "4.04.2";
meta.description = "Syntax extension for writing in-line tests in ocaml code";
propagatedBuildInputs = [ ppxlib time_now ];
doCheck = false; # test build rules broken
};
ppx_jane = janePackage {
pname = "ppx_jane";
hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j";
minimumOCamlVersion = "4.04.2";
meta.description = "Standard Jane Street ppx rewriters";
propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ];
};
ppx_js_style = janePackage {
pname = "ppx_js_style";
hash = "1ahk4mv63s9cw8ji62598ggw6b3lqpaljqa2ya7w91lify3lb76q";
minimumOCamlVersion = "4.04.2";
meta.description = "Code style checker for Jane Street Packages";
propagatedBuildInputs = [ octavius ppxlib ];
};
ppx_let = janePackage {
pname = "ppx_let";
hash = "1jq3g88xv9g6y9im67hiig3cfn5anwwnq09mp7yn7a86ha5r9w3i";
minimumOCamlVersion = "4.04.2";
meta.description = "Monadic let-bindings";
propagatedBuildInputs = [ ppxlib ];
};
ppx_module_timer = janePackage {
pname = "ppx_module_timer";
hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6";
minimumOCamlVersion = "4.04.2";
meta.description = "Ppx rewriter that records top-level module startup times";
propagatedBuildInputs = [ time_now ];
};
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk";
minimumOCamlVersion = "4.04.2";
meta.description = "Optional compilation for OCaml";
propagatedBuildInputs = [ ppxlib ];
};
ppx_optional = janePackage {
pname = "ppx_optional";
hash = "1d7rsdqiccxp2w4ykb9klarddm2qrrym3brbnhzx2hm78iyj3hzv";
minimumOCamlVersion = "4.04.2";
meta.description = "Pattern matching on flat options";
propagatedBuildInputs = [ ppxlib ];
};
ppx_pattern_bind = janePackage {
pname = "ppx_pattern_bind";
hash = "0yxkwnn30nxgrspi191zma95bgrh134aqh2bnpj3wg0245ki55zv";
minimumOCamlVersion = "4.07";
meta.description = "A ppx for writing fast incremental bind nodes in a pattern match";
propagatedBuildInputs = [ ppx_let ];
};
ppx_pipebang = janePackage {
pname = "ppx_pipebang";
hash = "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`";
propagatedBuildInputs = [ ppxlib ];
};
ppx_sexp_conv = janePackage {
pname = "ppx_sexp_conv";
version = "0.14.1";
minimumOCamlVersion = "4.04.2";
hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
propagatedBuildInputs = [ ppxlib sexplib0 base ];
};
ppx_sexp_message = janePackage {
pname = "ppx_sexp_message";
hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter for easy construction of s-expressions";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
};
ppx_sexp_value = janePackage {
pname = "ppx_sexp_value";
hash = "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
};
ppx_stable = janePackage {
pname = "ppx_stable";
version = "0.14.1";
hash = "1sp1kn23qr0pfypa4ilvhqq5y11y13xpfygfl582ra9kik5xqfa1";
minimumOCamlVersion = "4.04.2";
meta.description = "Stable types conversions generator";
propagatedBuildInputs = [ ppxlib ];
};
ppx_string = janePackage {
pname = "ppx_string";
version = "0.14.1";
minimumOCamlVersion = "4.04.2";
hash = "0a8khmg0y32kyn3q6idwgh0d6d1s6ms1w75gj3dzng0v7y4h6jx4";
meta.description = "Ppx extension for string interpolation";
propagatedBuildInputs = [ ppx_base ppxlib stdio ];
};
ppx_typerep_conv = janePackage {
pname = "ppx_typerep_conv";
version = "0.14.1";
minimumOCamlVersion = "4.04.2";
hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh";
meta.description = "Generation of runtime types from type declarations";
propagatedBuildInputs = [ ppxlib typerep ];
};
ppx_variants_conv = janePackage {
pname = "ppx_variants_conv";
version = "0.14.1";
minimumOCamlVersion = "4.04.2";
hash = "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84";
meta.description = "Generation of accessor and iteration functions for ocaml variant types";
propagatedBuildInputs = [ variantslib ppxlib ];
};
protocol_version_header = janePackage {
pname = "protocol_version_header";
hash = "0lfblv2yqw01bl074ga6vxii0p9mqwlqw1g9b9z7pfdva9wqilrd";
meta.description = "Protocol versioning";
propagatedBuildInputs = [ core_kernel ];
};
re2 = janePackage {
pname = "re2";
hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc";
meta.description = "OCaml bindings for RE2, Google's regular expression library";
propagatedBuildInputs = [ core_kernel ];
prePatch = ''
substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++'
substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))'
'';
};
re2_stable = janePackage {
pname = "re2_stable";
hash = "0kjc0ff6b3509s3b9n4q8ilb06d5fngdh3z58cm95vg7zkcas9w3";
meta.description = "Re2_stable adds an incomplete but stable serialization of Re2";
propagatedBuildInputs = [ core re2 ];
};
resource_cache = janePackage {
pname = "resource_cache";
hash = "197z9s535q74h00365ydhggg7hyzpyqvislgwwyi69sl1vy6dr0j";
meta.description = "General resource cache";
propagatedBuildInputs = [ async_rpc_kernel ];
};
sexp = janePackage {
pname = "sexp";
hash = "1x08pyrkd78233kgj70wxlc79w6jjhfrjdamm2xr7jzdc8ycfigf";
propagatedBuildInputs = [
async
core
csvfields
re2
sexp_diff_kernel
sexp_macro
sexp_pretty
sexp_select
];
patches = ./sexp.patch;
meta.description = "S-expression swiss knife";
};
sexp_diff_kernel = janePackage {
pname = "sexp_diff_kernel";
hash = "1pljcs019hs2ffhhb7rjh3xz7cbrk8vsv967jzmip3rv9w21c9kh";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Code for computing the diff of two sexps";
};
sexp_macro = janePackage {
pname = "sexp_macro";
hash = "1ih1g7vpb1j8vhzm9a5mjrrzgqrhjqdhf6vjrg8kxfqg5i5b8nyx";
propagatedBuildInputs = [ async sexplib ];
meta.description = "Sexp macros";
};
sexp_pretty = janePackage {
pname = "sexp_pretty";
hash = "0dax0wm511zgvr7p6kcd5gygi58118by7hsv7hymy8ldfcky5cwd";
minimumOCamlVersion = "4.07";
meta.description = "S-expression pretty-printer";
propagatedBuildInputs = [ ppx_base re sexplib ];
};
sexp_select = janePackage {
pname = "sexp_select";
hash = "1lchhfqw4afw38fnarwylqc2qp7k6xwx3j7m9gy8ygjgd0vgd729";
minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ base ppx_jane ];
meta.description = "A library to use CSS-style selectors to traverse sexp trees";
};
sexplib0 = janePackage {
pname = "sexplib0";
hash = "06sb3zqhb3dwqsmn15d769hfgqwqhxnm52iqim9l767gvlwpmibb";
minimumOCamlVersion = "4.04.2";
meta.description = "Library containing the definition of S-expressions and some base converters";
};
sexplib = janePackage {
pname = "sexplib";
hash = "03c3j1ihx4pjbb0x3arrcif3wvp3iva2ivnywhiak4mbbslgsnzr";
minimumOCamlVersion = "4.04.2";
meta.description = "Library for serializing OCaml values to and from S-expressions";
propagatedBuildInputs = [ num parsexp ];
};
shell = janePackage {
pname = "shell";
hash = "1c4zmpf6s1lk7nficip32c324if6zhm62h9h03d84zgvhvymi0r1";
meta.description = "Yet another implementation of fork&exec and related functionality";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ textutils ];
checkInputs = [ ounit ];
};
shexp = janePackage {
pname = "shexp";
hash = "1h6hsnbg6bk32f8iv6kd6im4mv2pjsjpd1mjsfx80p1n9273xack";
minimumOCamlVersion = "4.07";
propagatedBuildInputs = [ posixat spawn ];
meta.description = "Process library and s-expression based shell";
};
spawn = janePackage {
pname = "spawn";
version = "0.13.0";
minimumOCamlVersion = "4.02.3";
hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
meta.description = "Spawning sub-processes";
buildInputs = [ ppx_expect ];
doCheck = false; # tests are broken on NixOS (absolute paths)
};
splay_tree = janePackage {
pname = "splay_tree";
hash = "1xbzzbqb054hl1v1zcgfwdgzqihni3a0dmvrric9xggmgn4ycmqq";
meta.description = "A splay tree implementation";
propagatedBuildInputs = [ core_kernel ];
};
splittable_random = janePackage {
pname = "splittable_random";
hash = "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14";
meta.description = "PRNG that can be split into independent streams";
propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ];
};
stdio = janePackage {
pname = "stdio";
hash = "0vv6d8absy4hvjd1babv7avpsdlvjpnd5hq691h39d0h3pvs6l98";
minimumOCamlVersion = "4.04.2";
meta.description = "Standard IO library for OCaml";
propagatedBuildInputs = [ base ];
};
textutils = janePackage {
pname = "textutils";
hash = "1ggd0530lc5dkc419y3xw1wb52b4b5j3z78991gn5yxf2s50a8d4";
meta.description = "Text output utilities";
propagatedBuildInputs = [ core ];
};
time_now = janePackage {
pname = "time_now";
hash = "1lyq8zdz93hvpi4hpxh88kds30k5ljil8js9clcqyxrldp5n9mw0";
minimumOCamlVersion = "4.04.2";
meta.description = "Reports the current time";
buildInputs = [ jst-config ppx_optcomp ];
propagatedBuildInputs = [ jane-street-headers base ppx_base ];
};
timezone = janePackage {
pname = "timezone";
hash = "0zf075k94nk2wxnzpxia7pnm655damwp1b58xf2s9disia1ydxg7";
meta.description = "Time-zone handling";
propagatedBuildInputs = [ core_kernel ];
};
topological_sort = janePackage {
pname = "topological_sort";
hash = "17iz7956zln31p0xnm3jlhj863zi84bcx41jylzf7gk23qsm95m8";
meta.description = "Topological sort algorithm";
propagatedBuildInputs = [ ppx_jane stdio ];
};
typerep = janePackage {
pname = "typerep";
hash = "0wc7h853ka3s3lxxgm61ypidl0lzgc9abdkil6f72anl0c417y90";
minimumOCamlVersion = "4.04.2";
meta.description = "Typerep is a library for runtime types";
propagatedBuildInputs = [ base ];
};
variantslib = janePackage {
pname = "variantslib";
hash = "0vy0hpiaawmydh08nqlwjx52pasp74383yi0pshwbdxin99n9mxd";
minimumOCamlVersion = "4.04.2";
meta.description = "Part of Jane Street's Core library";
propagatedBuildInputs = [ base ];
};
vcaml = janePackage {
pname = "vcaml";
hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs";
meta.description = "OCaml bindings for the Neovim API";
propagatedBuildInputs = [ angstrom-async async_extra faraday ];
};
virtual_dom = janePackage {
pname = "virtual_dom";
hash = "0vcydxx0jhbd5hbriahgp947mc7n3xymyrsfny1c4adk6aaq3c5w";
meta.description = "OCaml bindings for the virtual-dom library";
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ core_kernel js_of_ocaml lambdasoup tyxml ];
};
zarith_stubs_js = janePackage {
pname = "zarith_stubs_js";
hash = "16p4bn5spkrx31fr4np945v9mwdq55706v3wl19s5fy6x83gvb86";
minimumOCamlVersion = "4.04.2";
meta.description = "Javascripts stubs for the Zarith library";
doCheck = false; # requires workspace with zarith
};
zstandard = janePackage {
pname = "zstandard";
hash = "1vf76v5m9wsh5f77w9z4i8sxm05wr5digyi95x4wvzdi7q3qg6m8";
meta.description = "OCaml bindings to Zstandard";
buildInputs = [ ppx_jane ];
propagatedBuildInputs = [ core ctypes zstd ];
};
}

14
pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix → pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
View File

@ -1,11 +1,17 @@
{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.13.0" }:
{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.14.0" }:
{ pname, version ? defaultVersion, hash, ...}@args:
{ pname
, version ? defaultVersion
, hash
, minimumOCamlVersion ? "4.08"
, doCheck ? true
, ...}@args:
buildDunePackage (args // {
useDune2 = true;
inherit version;
minimumOCamlVersion = "4.08";
inherit minimumOCamlVersion;
src = fetchFromGitHub {
owner = "janestreet";
@ -14,6 +20,8 @@ buildDunePackage (args // {
sha256 = hash;
};
inherit doCheck;
meta.license = lib.licenses.mit;
meta.homepage = "https://github.com/janestreet/${pname}";
})

19
pkgs/development/ocaml-modules/ocaml-r/default.nix
View File

@ -1,14 +1,20 @@
{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }:
{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R
, alcotest
}:
buildDunePackage rec {
pname = "ocaml-r";
version = "0.2.0";
version = "0.4.0";
useDune2 = true;
minimumOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "pveber";
repo = pname;
rev = "v${version}";
sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy";
sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri";
};
# Without the following patch, stub generation fails with:
@ -17,9 +23,14 @@ buildDunePackage rec {
substituteInPlace stubgen/stubgen.ml --replace \
'failwithf "not supported: %s" name ()' \
'sprintf "(* not supported: %s *)" name'
substituteInPlace lib/config/discover.ml --replace \
' libRmath"' '"'
'';
buildInputs = [ configurator pkg-config R stdio ];
buildInputs = [ pkg-config R dune-configurator stdio ];
doCheck = true;
checkInputs = [ alcotest ];
meta = {
description = "OCaml bindings for the R interpreter";

11
pkgs/development/ocaml-modules/phylogenetics/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }:
, alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }:
buildDunePackage rec {
pname = "phylogenetics";
version = "unstable-2020-01-25";
version = "unstable-2020-11-23";
useDune2 = true;
src = fetchFromGitHub {
owner = "biocaml";
repo = pname;
rev = "752a7d0324709ba919ef43630a270afd45d6b734";
sha256 = "1zsxpl1yjbw6y6n1q7qk3h0l7c0lxhh8yp8bkxlwnpzlkqq28ycg";
rev = "e6e10efa0a3a8fd61bf4ab69e91a09549cc1ded6";
sha256 = "0pmypzp0rvlpzm8zpbcfkphwnhrpyfwfv44kshvx2f8nslmksh8c";
};
minimumOCamlVersion = "4.08"; # e.g., uses Float.min
checkInputs = [ alcotest ];
propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ];
buildInputs = [ menhir ];
propagatedBuildInputs = [ angstrom-unix biocaml gnuplot gsl lacaml owl ppx_deriving printbox ];
doCheck = false; # many tests require bppsuite

31
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -1,24 +1,34 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
, legacy ? false
, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
, stdlib-shims
}:
let param =
if legacy then {
version = "0.8.1";
let param = {
"0.8.1" = {
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
} else {
version = "0.12.0";
sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1";
}; in
max_version = "4.10";
};
"0.13.0" = {
sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
};
"0.15.0" = {
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
min_version = "4.07";
useDune2 = true;
};
}."${version}"; in
if lib.versionAtLeast ocaml.version "4.10" && legacy
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}"
else
buildDunePackage rec {
pname = "ppxlib";
inherit (param) version;
inherit version;
useDune2 = param.useDune2 or false;
src = fetchFromGitHub {
owner = "ocaml-ppx";
@ -29,6 +39,7 @@ buildDunePackage rec {
propagatedBuildInputs = [
ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
stdlib-shims
];
meta = {

26
pkgs/development/ocaml-modules/sqlexpr/default.nix
View File

@ -1,26 +0,0 @@
{ stdenv, fetchurl, buildDunePackage, ocaml_lwt
, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
}:
buildDunePackage rec {
pname = "sqlexpr";
version = "0.9.0";
src = fetchurl {
url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz";
sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
};
buildInputs = [ lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
doCheck = true;
preBuild = "rm META.sqlexpr";
meta = {
description = "Type-safe, convenient SQLite database access";
homepage = "https://github.com/mfp/ocaml-sqlexpr";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ];
};
}

17
pkgs/development/ocaml-modules/sqlexpr/ppx.nix
View File

@ -1,17 +0,0 @@
{ buildDunePackage, sqlexpr, ounit
, ppxlib, ppx_tools_versioned, re, lwt_ppx
}:
buildDunePackage {
pname = "ppx_sqlexpr";
inherit (sqlexpr) version src meta;
minimumOCamlVersion = "4.06";
postPatch = ''
substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib
'';
buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ];
doCheck = true;
}

4
pkgs/development/python-modules/keepkey/default.nix
View File

@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "keepkey";
version = "6.0.3";
version = "6.6.0";
src = fetchFromGitHub {
owner = "keepkey";
repo = "python-keepkey";
rev = "v${version}";
sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm";
sha256 = "1v0ns26ykskn0dpbvz9g6lz4q740qmahvddj3pc3rfbjvg43p3vh";
};
propagatedBuildInputs = [ protobuf hidapi trezor ];

4
pkgs/development/python-modules/lightgbm/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "lightgbm";
version = "3.1.0";
version = "3.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82";
sha256 = "babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20";
};
nativeBuildInputs = [

36
pkgs/development/tools/haskell/haskell-language-server/default.nix
View File

@ -2,39 +2,39 @@
, bytestring, containers, data-default, deepseq, directory, extra
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger
, hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative
, optparse-simple, ormolu, process, regex-tdfa, retrie
, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty
, tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit
, tasty-rerun, temporary, text, time, transformers
, unordered-containers, yaml
, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api
, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec
, hspec-core, lens, lsp-test, mtl, optparse-applicative
, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
, temporary, text, time, transformers, unordered-containers, yaml
}:
mkDerivation {
pname = "haskell-language-server";
version = "0.6.0.0";
version = "0.7.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers data-default directory extra filepath ghc ghcide
gitrev haskell-lsp hie-bios hls-plugin-api hslogger
optparse-applicative optparse-simple process text
unordered-containers
gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
optparse-simple process shake text unordered-containers
];
executableHaskellDepends = [
aeson base binary brittany bytestring containers deepseq directory
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
gitrev hashable haskell-lsp hie-bios hls-hlint-plugin
hls-plugin-api hls-tactics-plugin hslogger lens mtl
optparse-applicative optparse-simple ormolu process regex-tdfa
retrie safe-exceptions shake stylish-haskell temporary text time
transformers unordered-containers
gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin
hls-hlint-plugin hls-plugin-api hls-retrie-plugin
hls-tactics-plugin hslogger lens mtl optparse-applicative
optparse-simple ormolu process regex-tdfa safe-exceptions shake
stylish-haskell temporary text time transformers
unordered-containers
];
testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default

36
pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix
View File

@ -1,36 +0,0 @@
{ mkDerivation, aeson, base, butcher, bytestring, cmdargs
, containers, czipwith, data-tree-print, deepseq, directory, extra
, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths
, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe
, semigroups, stdenv, strict, syb, text, transformers, uniplate
, unsafe, yaml
}:
mkDerivation {
pname = "brittany";
version = "0.12.1.1";
src = fetchgit {
url = "https://github.com/bubba/brittany";
sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl";
rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base butcher bytestring cmdargs containers czipwith
data-tree-print deepseq directory extra filepath ghc ghc-boot-th
ghc-exactprint ghc-paths monad-memo mtl multistate pretty random
safe semigroups strict syb text transformers uniplate unsafe yaml
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
aeson base butcher bytestring cmdargs containers czipwith
data-tree-print deepseq directory extra filepath ghc ghc-boot-th
ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec
pretty safe semigroups strict syb text transformers uniplate unsafe
yaml
];
homepage = "https://github.com/lspitzner/brittany/";
description = "Haskell source code formatter";
license = stdenv.lib.licenses.agpl3;
}

21
pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix Normal file
View File

@ -0,0 +1,21 @@
{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text
, unordered-containers
}:
mkDerivation {
pname = "hls-explicit-imports-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers deepseq ghc ghcide haskell-lsp-types
hls-plugin-api shake text unordered-containers
];
description = "Explicit imports plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

4
pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
View File

@ -10,8 +10,8 @@ mkDerivation {
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";

23
pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix Normal file
View File

@ -0,0 +1,23 @@
{ mkDerivation, aeson, base, containers, deepseq, directory, extra
, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text
, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-retrie-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers deepseq directory extra ghc ghcide hashable
haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
shake text transformers unordered-containers
];
description = "Retrie integration plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

12
pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
View File

@ -1,8 +1,8 @@
{ mkDerivation, aeson, base, checkers, containers, deepseq
, directory, extra, fetchgit, filepath, fingertree, generic-lens
, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl
, QuickCheck, refinery, retrie, shake, stdenv, syb, text
, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text
, transformers
}:
mkDerivation {
@ -10,8 +10,8 @@ mkDerivation {
version = "0.5.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj";
rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
@ -25,8 +25,8 @@ mkDerivation {
base checkers containers ghc hie-bios hls-plugin-api hspec mtl
QuickCheck
];
homepage = "https://github.com/isovector/hls-tactics-plugin#readme";
description = "LSP server for GHC";
testToolDepends = [ hspec-discover ];
description = "Tactics plugin for Haskell Language Server";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}

32
pkgs/development/tools/haskell/haskell-language-server/update.sh
View File

@ -15,23 +15,6 @@ set -eo pipefail
# This is the directory of this update.sh script.
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# ===========================
# HLS maintainer's Brittany fork
# ===========================
# brittany derivation created with cabal2nix.
brittany_derivation_file="${script_dir}/hls-brittany.nix"
# This is the current revision of the brittany fork in Nixpkgs.
brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")"
brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output)
echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version."
echo "Running cabal2nix and outputting to ${brittany_derivation_file}..."
cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file"
# ===========================
# HLS
# ===========================
@ -43,7 +26,18 @@ hls_derivation_file="${script_dir}/default.nix"
hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")"
# This is the latest release version of hls on GitHub.
hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'),
# sort for the latest one and select just that
hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags |
jq --raw-output 'map(.name) | .[]' |
grep '^[0-9]' |
sort --version-sort |
tail -n1)
# Use this value instead for the very latest revision
# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
hls_new_version=$hls_latest_release
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
@ -51,5 +45,7 @@ echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix"
echo "Finished."

4
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -5,12 +5,12 @@
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.7.0";
version = "3.7.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "0rw6cfkl3zlyav8q2w7grxxqjmg35mz5rgvmkiqb58nl4gmgzx6w";
sha256 = "0i0smhvsfx2ydmbyg5ai5cgqsfnng8rkcvys4i3fa55cw24aknrn";
};
nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ];

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@ -2,6 +2,10 @@
, js_of_ocaml, ppxlib
}:
if !stdenv.lib.versionAtLeast ppxlib.version "0.14"
then throw "js_of_ocaml-ppx_deriving_json is not compatible with ppxlib ${ppxlib.version}"
else
stdenv.mkDerivation {
pname = "js_of_ocaml-ppx_deriving_json";

8
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, fetchzip, ocamlPackages
{ lib, fetchurl, fetchzip, ocaml-ng
, version
, tarballName ? "ocamlformat-${version}.tbz",
}:
@ -22,6 +22,12 @@ let src =
}
; in
let ocamlPackages =
if lib.versionAtLeast version "0.14.3"
then ocaml-ng.ocamlPackages
else ocaml-ng.ocamlPackages_4_07
; in
with ocamlPackages;
buildDunePackage rec {

24
pkgs/development/tools/pandoc/default.nix
View File

@ -8,30 +8,6 @@ in
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
patches = (drv.patches or []) ++ [
# Add xmlns to top-level tags in Docbook, required for nixpkgs manual.
# https://github.com/jgm/pandoc/pull/6923
(fetchpatch {
url = "https://github.com/jgm/pandoc/commit/6f35600204132c5a0907bb7cccb2e10ffb27506a.patch";
sha256 = "gRUqc4YG4lZdCZn21fPmlcrFyZ3/VlDx71lU8GMuGSs=";
})
# Generate admonitions in DocBook, required for nixpkgs manual.
# https://github.com/jgm/pandoc/pull/6922
(fetchpatch {
url = "https://github.com/jgm/pandoc/commit/dc6856530c2cb6ca58ed82721ab895b86cfe0c1c.patch";
sha256 = "EdsUDlHzsfRscXBR4EP2Z5ZEz+NfrmFHnV7c1hJczio=";
})
# Use correct id attributes in DocBook, required for nixpkgs manual.
(fetchpatch {
url = "https://github.com/jgm/pandoc/commit/16ef87745702f69d5aa948fbe6d2101577dee8f4.patch";
sha256 = "WyWTqrO6hGsMgJ7o7QL1BNvhkm0yIO1XJOcfPBDy6ag=";
})
# Allow using admonition titles from Markdown in DocBook.
(fetchpatch {
url = "https://github.com/jgm/pandoc/commit/70c7c5703afcbd1cbf2a80c2be515e038abcd419.patch";
sha256 = "2kHQ1qy/UdDi/chwCBvMjAPA/XFH42vWFCjR46Jgt6M=";
})
];
})).overrideAttrs (drv: {
# These libraries are still referenced, because they generate

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2020.12.0";
version = "2020.12.1";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -62,7 +62,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2020.12.0";
hassVersion = "2020.12.1";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "04bmyzran5ylmar8m73n7p34dsz73m37r1nibd13yyfhvn1j1i1l";
sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr";
};
# leave this in, so users don't have to constantly update their downstream patch handling

4
pkgs/tools/misc/patdiff/default.nix
View File

@ -4,8 +4,8 @@ with ocamlPackages;
janePackage {
pname = "patdiff";
hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz";
buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ];
hash = "1yslj6xxyv8rx8y5s1civ1zq8y6vvxmkszdds958zdm1p1ign54r";
buildInputs = [ core patience_diff ocaml_pcre ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};

21
pkgs/top-level/ocaml-packages.nix
View File

@ -826,10 +826,6 @@ let
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
sqlexpr = callPackage ../development/ocaml-modules/sqlexpr {
ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1;
};
tsort = callPackage ../development/ocaml-modules/tsort { };
tuntap = callPackage ../development/ocaml-modules/tuntap { };
@ -901,8 +897,6 @@ let
ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
};
ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {};
ppx_tools =
if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_tools {}
@ -1055,29 +1049,32 @@ let
janePackage =
if lib.versionOlder "4.08" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {}
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {}
else if lib.versionOlder "4.07" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}
else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet =
if lib.versionOlder "4.08" ocaml.version
then import ../development/ocaml-modules/janestreet/0.13.nix {
inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith;
inherit (pkgs) openssl;
then import ../development/ocaml-modules/janestreet/0.14.nix {
inherit alcotest angstrom angstrom-async base64 cryptokit ctypes
dune-configurator faraday inotify janePackage js_of_ocaml
js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit
ppxlib re tyxml uri-sexp zarith;
inherit (pkgs) openssl zstd;
}
else if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
inherit ctypes janePackage num octavius re;
inherit (pkgs) openssl;
ppxlib = ppxlib.override { legacy = true; };
ppxlib = ppxlib.override { version = "0.8.1"; };
}
else import ../development/ocaml-modules/janestreet {
inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re;
inherit (pkgs) openssl;
ppxlib = ppxlib.override { legacy = true; };
ppxlib = ppxlib.override { version = "0.8.1"; };
};
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {