Merge master into staging-next
This commit is contained in:
commit
fc6ab3024e
28 changed files with 2788 additions and 1452 deletions
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.3.3";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IBdQlVZx7Bt4y7B7FvHJihHUWO15a89hs+SGwcobDqY=";
|
||||
sha256 = "sha256-8SWbbdPx/cC7EWTkSbB/YqR13jaL76fFIjHPGL4rFyk=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
|
17
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
17
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
|
@ -31,8 +31,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.All";
|
||||
version = "1.2.14";
|
||||
sha256 = "0avb0jlisx1nv0ary2nc82aamn95qmrrqshwbk8szzjqgvxzv4k2";
|
||||
version = "1.2.16";
|
||||
sha256 = "1dq8xzvg51iskvak28ishxm98b5r1qlybh2r36a079764vl5prn1";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Charge";
|
||||
|
@ -51,13 +51,13 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Eclair";
|
||||
version = "1.2.7";
|
||||
sha256 = "1h15gic45wps4nvmxyfmfils9nicbz3xkli705hq69g0mafy0f23";
|
||||
version = "1.2.8";
|
||||
sha256 = "01462fjc0zmgafqk7w0cl880wir9mah90r68xyw607ij28pdc2zf";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.LND";
|
||||
version = "1.2.10";
|
||||
sha256 = "10m8kw7598l9ap6y17znvm43cz5ca6qxbrh105knyb6hfzpsyqwp";
|
||||
version = "1.2.12";
|
||||
sha256 = "1dqg682lxv61rfwxxqqlc5fal8y5sz7dmf7p70rg7l9csgzgn67r";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "BTCPayServer.Lightning.Ptarmigan";
|
||||
|
@ -779,6 +779,11 @@
|
|||
version = "6.0.15";
|
||||
sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "6.0.17";
|
||||
sha256 = "1dl3rmmx33041sd0lsj54lk19mzyd8j2nngjmbnn8s4gsdnzd7z1";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "6.0.3";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.2.16";
|
||||
version = "2.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6nq5oCEVADZbzQJaEizzt6Lag11bZYLKGMTl2snZob8=";
|
||||
sha256 = "sha256-zjSHgMdK417bm1Z/B2kvloDnPTqzM9jEVkZvoKeBkzM=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
|
5
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
5
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
|
@ -194,6 +194,11 @@
|
|||
version = "6.0.15";
|
||||
sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NBitcoin";
|
||||
version = "6.0.18";
|
||||
sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NETStandard.Library";
|
||||
version = "1.6.1";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "f38385b8e3e064360be513204f114418ea0206de",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f38385b8e3e064360be513204f114418ea0206de.tar.gz",
|
||||
"sha256": "08yrxx2cslwbbrcrjn13va2vbynjrwfbkc3fs4mf9qc17bdvxmgj",
|
||||
"msg": "Update from Hackage at 2021-11-12T03:22:57Z"
|
||||
"commit": "5ac4efab1c8e40b19b0bc4ba833477a4abc75358",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5ac4efab1c8e40b19b0bc4ba833477a4abc75358.tar.gz",
|
||||
"sha256": "0xnrdwmc646ghwzp61jp376s9fkpcd74slxc39law7akfp77v4ls",
|
||||
"msg": "Update from Hackage at 2021-11-18T20:32:52Z"
|
||||
}
|
||||
|
|
|
@ -38,9 +38,6 @@
|
|||
# platform). Static libs are always built.
|
||||
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
|
||||
|
||||
, # Whether to build terminfo.
|
||||
enableTerminfo ? !stdenv.targetPlatform.isWindows
|
||||
|
||||
, version ? "9.3.20211111"
|
||||
, # What flavour to build. An empty string indicates no
|
||||
# specific flavour and falls back to ghc default values.
|
||||
|
@ -116,11 +113,17 @@ let
|
|||
GhcRtsHcOpts += -fPIC
|
||||
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
EXTRA_CC_OPTS += -std=gnu99
|
||||
''
|
||||
# While split sections are now enabled by default in ghc 8.8 for windows,
|
||||
# they seem to lead to `too many sections` errors when building base for
|
||||
# profiling.
|
||||
+ lib.optionalString targetPlatform.isWindows ''
|
||||
SplitSections = NO
|
||||
'';
|
||||
|
||||
# Splicer will pull out correct variations
|
||||
libDeps = platform: lib.optional enableTerminfo ncurses
|
||||
++ [libffi]
|
||||
libDeps = platform:
|
||||
[libffi ncurses]
|
||||
++ lib.optional (!enableNativeBignum) gmp
|
||||
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
|
||||
++ lib.optional enableDwarf elfutils;
|
||||
|
|
|
@ -94,6 +94,14 @@ self: super: {
|
|||
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
|
||||
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
|
||||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
|
||||
|
||||
# Similar RTS issue in test suite:
|
||||
# rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
|
||||
hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
|
||||
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
|
||||
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
|
||||
|
||||
|
||||
# https://github.com/ekmett/half/issues/35
|
||||
half = dontCheck super.half;
|
||||
|
|
|
@ -68,7 +68,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "1dj93291kh3wm46ardacpbblisarw5pmv683pdiqcngfhlp1m91a";
|
||||
sha256 = "06njg44840na3ps3s29kjhjba0962vdr2zpd12yvqf16rwgf4zmq";
|
||||
# delete android and Android directories which cause issues on
|
||||
# darwin (case insensitive directory). Since we don't need them
|
||||
# during the build process, we can delete it to prevent a hash
|
||||
|
@ -77,14 +77,6 @@ self: super: {
|
|||
rm -r $out/doc/?ndroid*
|
||||
'';
|
||||
};
|
||||
patches = [
|
||||
# Allows compilation with git-lfs 1.2.0
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=f3326b8b5ae4d1caa5c6e3e192c58c6e064c425a";
|
||||
sha256 = "1nzg4mna462ndylisyy3nfih49aznhzzf7b3krb4p9p0j1zrcy2s";
|
||||
excludes = [ "doc/**" "CHANGELOG" ];
|
||||
})
|
||||
] ++ (drv.patches or []);
|
||||
}) super.git-annex;
|
||||
|
||||
# Fix test trying to access /home directory
|
||||
|
@ -95,6 +87,9 @@ self: super: {
|
|||
# https://github.com/froozen/kademlia/issues/2
|
||||
kademlia = dontCheck super.kademlia;
|
||||
|
||||
# https://github.com/haskell-game/dear-imgui.hs/issues/116
|
||||
dear-imgui = doJailbreak super.dear-imgui;
|
||||
|
||||
# Tests require older versions of tasty.
|
||||
hzk = dontCheck super.hzk;
|
||||
resolv = doJailbreak super.resolv;
|
||||
|
@ -115,6 +110,10 @@ self: super: {
|
|||
buildDepends = [ pkgs.qt5.wrapQtAppsHook ];
|
||||
}) super.qtah-cpp-qt5;
|
||||
|
||||
# Missing test data
|
||||
# https://github.com/aleksey-makarov/melf/issues/1
|
||||
melf = dontCheck super.melf;
|
||||
|
||||
# The Haddock phase fails for one reason or another.
|
||||
deepseq-magic = dontHaddock super.deepseq-magic;
|
||||
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
|
||||
|
@ -1345,21 +1344,21 @@ self: super: {
|
|||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_8_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_4;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
}));
|
||||
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_8_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_4;
|
||||
});
|
||||
hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
}));
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_8_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_4;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_4;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_9_1;
|
||||
});
|
||||
pg-client = overrideCabal (drv: {
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
|
@ -1434,6 +1433,20 @@ self: super: {
|
|||
# 2021-09-14: Tests are broken because of undeterministic variable names
|
||||
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
|
||||
|
||||
# 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2373
|
||||
hls-explicit-imports-plugin = dontCheck super.hls-explicit-imports-plugin;
|
||||
|
||||
# 2021-11-20: https://github.com/haskell/haskell-language-server/pull/2374
|
||||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
|
||||
# 2021-11-20: Testsuite hangs.
|
||||
# https://github.com/haskell/haskell-language-server/issues/2375
|
||||
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
|
||||
|
||||
# 2021-11-23: Too strict bounds on ghcide, pending new release
|
||||
hls-rename-plugin = assert super.hls-rename-plugin.version == "1.0.0.0";
|
||||
doJailbreak super.hls-rename-plugin;
|
||||
|
||||
# 2021-03-21: Test hangs
|
||||
# https://github.com/haskell/haskell-language-server/issues/1562
|
||||
# 2021-11-13: Too strict upper bound on implicit-hie-cradle
|
||||
|
@ -2081,9 +2094,9 @@ EOT
|
|||
# Jailbreak isn't sufficient, but this is ok as it's a leaf package.
|
||||
hadolint = super.hadolint.overrideScope (self: super: {
|
||||
language-docker = self.language-docker_10_3_0;
|
||||
hspec = dontCheck self.hspec_2_8_4;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_4;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_8_4;
|
||||
hspec = dontCheck self.hspec_2_9_1;
|
||||
hspec-core = dontCheck self.hspec-core_2_9_1;
|
||||
hspec-discover = dontCheck self.hspec-discover_2_9_1;
|
||||
colourista = doJailbreak super.colourista;
|
||||
});
|
||||
|
||||
|
@ -2097,4 +2110,9 @@ EOT
|
|||
brick = self.brick_0_64_2;
|
||||
};
|
||||
|
||||
# Needs matching xmonad version
|
||||
xmonad-contrib_0_17_0 = super.xmonad-contrib_0_17_0.override {
|
||||
xmonad = self.xmonad_0_17_0;
|
||||
};
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
@ -105,7 +105,7 @@ self: super: {
|
|||
base64-bytestring = dontCheck super.base64-bytestring;
|
||||
|
||||
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
|
||||
lens = super.lens_5_0_1;
|
||||
lens = super.lens_5_1;
|
||||
|
||||
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
|
||||
memory = super.memory_0_16_0;
|
||||
|
|
|
@ -55,9 +55,6 @@ self: super: {
|
|||
excludes = ["*.cabal"];
|
||||
}) (doJailbreak super.aeson);
|
||||
|
||||
# Tests use Data.Semigroup.Option
|
||||
aeson_2_0_1_0 = dontCheck (doJailbreak super.aeson_2_0_1_0);
|
||||
|
||||
basement = overrideCabal (drv: {
|
||||
# This is inside a conditional block so `doJailbreak` doesn't work
|
||||
postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal";
|
||||
|
@ -151,17 +148,8 @@ self: super: {
|
|||
] ++ drv.testFlags or [];
|
||||
}) (doJailbreak super.hpack);
|
||||
|
||||
# Patch for TH code from head.hackage
|
||||
vector-th-unbox = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/vector-th-unbox-0.2.1.9.patch";
|
||||
sha256 = "02bvvy3hx3cf4y4dr64zl5pjvq8giwk4286j5g1n6k8ikyn2403p";
|
||||
}) (doJailbreak super.vector-th-unbox);
|
||||
|
||||
# base 4.15 support from head.hackage
|
||||
lens = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/lens-5.0.1.patch";
|
||||
sha256 = "1s8qqg7ymvv94dnfnr1ragx91chh9y7ydc4jx25zn361wbn00pv7";
|
||||
}) (doJailbreak super.lens_5_0_1);
|
||||
# lens >= 5.1 supports 9.2.1
|
||||
lens = super.lens_5_1;
|
||||
|
||||
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
|
||||
alex = dontCheck super.alex;
|
||||
|
@ -201,11 +189,6 @@ self: super: {
|
|||
# Upper bound on `hashable` is too restrictive
|
||||
semigroupoids = overrideCabal (drv: { postPatch = "sed -i -e 's,hashable >= 1.2.7.0 && < 1.4,hashable >= 1.2.7.0 \\&\\& < 1.5,' semigroupoids.cabal";}) super.semigroupoids;
|
||||
|
||||
streaming-commons = appendPatch (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch";
|
||||
sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";
|
||||
}) super.streaming-commons;
|
||||
|
||||
# Tests have a circular dependency on quickcheck-instances
|
||||
text-short = dontCheck super.text-short_0_1_4;
|
||||
|
||||
|
|
|
@ -74,7 +74,4 @@ self: super: {
|
|||
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
# Fix build with ghc 8.6.x.
|
||||
git-annex = appendPatch ./patches/git-annex-fix-ghc-8.6.x-build.patch super.git-annex;
|
||||
|
||||
}
|
||||
|
|
|
@ -1135,6 +1135,7 @@ broken-packages:
|
|||
- dotfs
|
||||
- dot-linker
|
||||
- doublify-toolkit
|
||||
- dovetail
|
||||
- downloader
|
||||
- dozenal
|
||||
- dozens
|
||||
|
@ -1328,6 +1329,7 @@ broken-packages:
|
|||
- explicit-constraint-lens
|
||||
- explicit-determinant
|
||||
- explicit-iomodes
|
||||
- exploring-interpreters
|
||||
- exposed-containers
|
||||
- expression-parser
|
||||
- expressions
|
||||
|
@ -1663,15 +1665,19 @@ broken-packages:
|
|||
- ghc-usage
|
||||
- gh-labeler
|
||||
- giak
|
||||
- gi-cogl
|
||||
- Gifcurry
|
||||
- gi-graphene
|
||||
- gi-gsttag
|
||||
- gi-gtk-layer-shell
|
||||
- gi-gtkosxapplication
|
||||
- gi-gtksheet
|
||||
- gi-handy
|
||||
- gi-json
|
||||
- ginsu
|
||||
- gipeda
|
||||
- giphy-api
|
||||
- gi-rsvg
|
||||
- gist
|
||||
- GiST
|
||||
- git
|
||||
|
@ -3456,6 +3462,7 @@ broken-packages:
|
|||
- onama
|
||||
- ONC-RPC
|
||||
- on-demand-ssh-tunnel
|
||||
- one-line-aeson-text
|
||||
- one-liner-instances
|
||||
- oneormore
|
||||
- onpartitions
|
||||
|
@ -3784,6 +3791,7 @@ broken-packages:
|
|||
- polydata-core
|
||||
- polynom
|
||||
- polynomial
|
||||
- polysemy-mocks
|
||||
- polysemy-plugin
|
||||
- polysemy-zoo
|
||||
- polytypeable
|
||||
|
@ -4722,6 +4730,7 @@ broken-packages:
|
|||
- stripe-http-streams
|
||||
- stripe-signature
|
||||
- stripe-tests
|
||||
- stripe-wreq
|
||||
- strong-path
|
||||
- strongswan-sql
|
||||
- structural-traversal
|
||||
|
|
|
@ -101,6 +101,27 @@ default-package-overrides:
|
|||
# 2021-11-18: lucid-{alpine, htmx} are not in stackage, so we need to downgrade them
|
||||
- lucid-alpine == 0.1.0.2
|
||||
- lucid-htmx == 0.1.0.2
|
||||
# 2021-11-21: restrict haskell-gi-related packages to match stackage version (0.25)
|
||||
- gi-girepository < 1.0.25
|
||||
- gi-ggit < 1.0.11
|
||||
- gi-gst < 1.0.25
|
||||
- gi-gstaudio < 1.0.24
|
||||
- gi-gstbase < 1.0.25
|
||||
- gi-gstvideo < 1.0.25
|
||||
- gi-gtksource < 3.0.25
|
||||
- gi-ibus < 1.5.4
|
||||
- gi-javascriptcore < 4.0.24
|
||||
- gi-ostree < 1.0.15
|
||||
- gi-notify < 0.7.24
|
||||
- gi-pangocairo < 1.0.26
|
||||
- gi-poppler < 0.18.26
|
||||
- gi-secret < 0.0.14
|
||||
- gi-soup < 2.4.25
|
||||
- gi-vte < 2.91.29
|
||||
- gi-webkit2 < 4.0.28
|
||||
- gi-webkit2webextension < 4.0.27
|
||||
- gi-wnck < 3.0.11
|
||||
# gi-cogl, gi-coglpango, gi-clutter, gi-json, gi-rsvg are only available for haskell-gi >= 0.26
|
||||
|
||||
extra-packages:
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
@ -133,6 +154,7 @@ extra-packages:
|
|||
- ghc-lib == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version
|
||||
- ghc-lib-parser == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version
|
||||
- ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.1 compatible version
|
||||
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 18.16
|
||||
# Stackage LTS 18.17
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
@ -32,7 +32,7 @@ default-package-overrides:
|
|||
- aeson-typescript ==0.3.0.1
|
||||
- aeson-with ==0.1.2.0
|
||||
- aeson-yak ==0.1.1.3
|
||||
- aeson-yaml ==1.1.0.0
|
||||
- aeson-yaml ==1.1.0.1
|
||||
- Agda ==2.6.2
|
||||
- agda2lagda ==0.2021.6.1
|
||||
- al ==0.1.4.2
|
||||
|
@ -164,13 +164,13 @@ default-package-overrides:
|
|||
- arrow-extras ==0.1.0.1
|
||||
- arrows ==0.4.4.2
|
||||
- ascii ==1.0.1.6
|
||||
- ascii-case ==1.0.0.6
|
||||
- ascii-char ==1.0.0.10
|
||||
- ascii-case ==1.0.0.8
|
||||
- ascii-char ==1.0.0.12
|
||||
- asciidiagram ==1.3.3.3
|
||||
- ascii-group ==1.0.0.6
|
||||
- ascii-group ==1.0.0.8
|
||||
- ascii-predicates ==1.0.0.6
|
||||
- ascii-progress ==0.3.3.0
|
||||
- ascii-superset ==1.0.1.6
|
||||
- ascii-superset ==1.0.1.8
|
||||
- ascii-th ==1.0.0.6
|
||||
- asn1-encoding ==0.9.6
|
||||
- asn1-parse ==0.9.5
|
||||
|
@ -232,7 +232,7 @@ default-package-overrides:
|
|||
- bcp47 ==0.2.0.4
|
||||
- bcp47-orphans ==0.1.0.4
|
||||
- bcrypt ==0.0.11
|
||||
- bech32 ==1.1.1
|
||||
- bech32 ==1.1.2
|
||||
- bech32-th ==1.0.2
|
||||
- bench ==1.0.12
|
||||
- benchpress ==0.2.2.18
|
||||
|
@ -288,7 +288,7 @@ default-package-overrides:
|
|||
- bordacount ==0.1.0.0
|
||||
- boring ==0.2
|
||||
- both ==0.1.1.2
|
||||
- bound ==2.0.3
|
||||
- bound ==2.0.4
|
||||
- BoundedChan ==1.0.3.0
|
||||
- bounded-queue ==1.0.0
|
||||
- boundingboxes ==0.2.3
|
||||
|
@ -304,13 +304,13 @@ default-package-overrides:
|
|||
- bugsnag-haskell ==0.0.4.1
|
||||
- bugsnag-hs ==0.2.0.7
|
||||
- bugzilla-redhat ==0.3.3
|
||||
- burrito ==1.2.0.2
|
||||
- burrito ==1.2.0.3
|
||||
- butcher ==1.3.3.2
|
||||
- buttplug-hs-core ==0.1.0.1
|
||||
- bv ==0.5
|
||||
- bv-little ==1.1.1
|
||||
- byteable ==0.1.1
|
||||
- byte-count-reader ==0.10.1.6
|
||||
- byte-count-reader ==0.10.1.7
|
||||
- bytedump ==1.0
|
||||
- byte-order ==0.1.2.0
|
||||
- byteorder ==1.0.4
|
||||
|
@ -332,7 +332,7 @@ default-package-overrides:
|
|||
- cabal-appimage ==0.3.0.3
|
||||
- cabal-clean ==0.1.20210924
|
||||
- cabal-debian ==5.1
|
||||
- cabal-doctest ==1.0.8
|
||||
- cabal-doctest ==1.0.9
|
||||
- cabal-file ==0.1.1
|
||||
- cabal-flatpak ==0.1.0.2
|
||||
- cabal-plan ==0.7.2.0
|
||||
|
@ -466,7 +466,7 @@ default-package-overrides:
|
|||
- connection-pool ==0.2.2
|
||||
- console-style ==0.0.2.1
|
||||
- constraint ==0.1.4.0
|
||||
- constraints ==0.13.1
|
||||
- constraints ==0.13.2
|
||||
- constraints-extras ==0.3.2.0
|
||||
- constraint-tuples ==0.1.2
|
||||
- construct ==0.3.0.2
|
||||
|
@ -499,9 +499,9 @@ default-package-overrides:
|
|||
- cryptohash ==0.11.9
|
||||
- cryptohash-cryptoapi ==0.1.4
|
||||
- cryptohash-md5 ==0.11.101.0
|
||||
- cryptohash-sha1 ==0.11.100.1
|
||||
- cryptohash-sha1 ==0.11.101.0
|
||||
- cryptohash-sha256 ==0.11.102.1
|
||||
- cryptohash-sha512 ==0.11.100.1
|
||||
- cryptohash-sha512 ==0.11.101.0
|
||||
- cryptonite ==0.29
|
||||
- cryptonite-conduit ==0.2.2
|
||||
- cryptonite-openssl ==0.7
|
||||
|
@ -529,7 +529,7 @@ default-package-overrides:
|
|||
- cursor-gen ==0.3.0.0
|
||||
- cutter ==0.0
|
||||
- cyclotomic ==1.1.1
|
||||
- czipwith ==1.0.1.3
|
||||
- czipwith ==1.0.1.4
|
||||
- d10 ==0.2.1.6
|
||||
- data-accessor ==0.2.3
|
||||
- data-accessor-mtl ==0.2.0.4
|
||||
|
@ -589,7 +589,7 @@ default-package-overrides:
|
|||
- deque ==0.4.4
|
||||
- deriveJsonNoPrefix ==0.1.0.1
|
||||
- derive-topdown ==0.0.2.2
|
||||
- deriving-aeson ==0.2.7
|
||||
- deriving-aeson ==0.2.8
|
||||
- deriving-compat ==0.5.10
|
||||
- derulo ==1.0.10
|
||||
- dhall ==1.39.0
|
||||
|
@ -775,7 +775,7 @@ default-package-overrides:
|
|||
- fixed ==0.3
|
||||
- fixed-length ==0.2.3
|
||||
- fixed-vector ==1.2.0.0
|
||||
- fixed-vector-hetero ==0.6.1.0
|
||||
- fixed-vector-hetero ==0.6.1.1
|
||||
- fix-whitespace ==0.0.7
|
||||
- flac ==0.2.0
|
||||
- flac-picture ==0.1.2
|
||||
|
@ -904,7 +904,7 @@ default-package-overrides:
|
|||
- ghc-typelits-extra ==0.4.3
|
||||
- ghc-typelits-knownnat ==0.7.6
|
||||
- ghc-typelits-natnormalise ==0.7.6
|
||||
- ghc-typelits-presburger ==0.6.0.0
|
||||
- ghc-typelits-presburger ==0.6.1.0
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.23
|
||||
- gi-cairo ==1.0.25
|
||||
|
@ -935,7 +935,7 @@ default-package-overrides:
|
|||
- gl ==0.9
|
||||
- glabrous ==2.0.5
|
||||
- GLFW-b ==3.3.0.0
|
||||
- Glob ==0.10.1
|
||||
- Glob ==0.10.2
|
||||
- gloss ==1.13.2.1
|
||||
- gloss-rendering ==1.13.1.1
|
||||
- GLURaw ==2.0.0.4
|
||||
|
@ -955,9 +955,9 @@ default-package-overrides:
|
|||
- graphviz ==2999.20.1.0
|
||||
- graph-wrapper ==0.2.6.0
|
||||
- gravatar ==0.8.0
|
||||
- greskell ==1.2.0.1
|
||||
- greskell-core ==0.1.3.6
|
||||
- greskell-websocket ==0.1.2.5
|
||||
- greskell ==1.2.0.2
|
||||
- greskell-core ==0.1.3.7
|
||||
- greskell-websocket ==0.1.2.6
|
||||
- groom ==0.1.2.1
|
||||
- group-by-date ==0.1.0.4
|
||||
- groups ==0.5.3
|
||||
|
@ -1027,7 +1027,7 @@ default-package-overrides:
|
|||
- hedgehog-fn ==1.0
|
||||
- hedgehog-quickcheck ==0.1.1
|
||||
- hedis ==0.14.4
|
||||
- hedn ==0.3.0.3
|
||||
- hedn ==0.3.0.4
|
||||
- here ==1.2.13
|
||||
- heredoc ==0.2.0.0
|
||||
- heterocephalus ==1.0.5.4
|
||||
|
@ -1127,7 +1127,7 @@ default-package-overrides:
|
|||
- hspec-leancheck ==0.0.6
|
||||
- hspec-megaparsec ==2.2.0
|
||||
- hspec-meta ==2.7.8
|
||||
- hspec-need-env ==0.1.0.7
|
||||
- hspec-need-env ==0.1.0.8
|
||||
- hspec-parsec ==0
|
||||
- hspec-smallcheck ==0.5.2
|
||||
- hspec-tables ==0.0.1
|
||||
|
@ -1137,9 +1137,9 @@ default-package-overrides:
|
|||
- hsshellscript ==3.5.0
|
||||
- hs-tags ==0.1.5.2
|
||||
- HStringTemplate ==0.8.8
|
||||
- HSvm ==0.1.1.3.22
|
||||
- HSvm ==0.1.1.3.25
|
||||
- HsYAML ==0.2.1.0
|
||||
- HsYAML-aeson ==0.2.0.0
|
||||
- HsYAML-aeson ==0.2.0.1
|
||||
- hsyslog ==5.0.2
|
||||
- htaglib ==1.2.0
|
||||
- HTF ==0.14.0.6
|
||||
|
@ -1246,7 +1246,7 @@ default-package-overrides:
|
|||
- instance-control ==0.1.2.0
|
||||
- int-cast ==0.2.0.0
|
||||
- integer-logarithms ==1.0.3.1
|
||||
- integer-roots ==1.0.0.1
|
||||
- integer-roots ==1.0.1.0
|
||||
- integration ==0.2.1
|
||||
- intern ==0.9.4
|
||||
- interpolate ==0.2.1
|
||||
|
@ -1299,7 +1299,7 @@ default-package-overrides:
|
|||
- js-flot ==0.8.3
|
||||
- js-jquery ==3.3.1
|
||||
- json ==0.10
|
||||
- json-feed ==1.0.14
|
||||
- json-feed ==1.0.15
|
||||
- jsonifier ==0.1.1
|
||||
- jsonpath ==0.2.0.0
|
||||
- json-rpc ==1.0.3
|
||||
|
@ -1332,7 +1332,7 @@ default-package-overrides:
|
|||
- kubernetes-webhook-haskell ==0.2.0.3
|
||||
- l10n ==0.1.0.1
|
||||
- labels ==0.3.3
|
||||
- lackey ==1.0.15
|
||||
- lackey ==1.0.16
|
||||
- lambdabot-core ==5.3.0.2
|
||||
- LambdaHack ==0.10.3.0
|
||||
- lame ==0.2.0
|
||||
|
@ -1370,7 +1370,7 @@ default-package-overrides:
|
|||
- lens-datetime ==0.3
|
||||
- lens-family ==2.0.0
|
||||
- lens-family-core ==2.0.0
|
||||
- lens-family-th ==0.5.2.0
|
||||
- lens-family-th ==0.5.2.1
|
||||
- lens-misc ==0.0.2.0
|
||||
- lens-process ==0.4.0.0
|
||||
- lens-properties ==4.11.1
|
||||
|
@ -1458,7 +1458,7 @@ default-package-overrides:
|
|||
- mathexpr ==0.3.0.0
|
||||
- math-extras ==0.1.1.0
|
||||
- math-functions ==0.3.4.2
|
||||
- matplotlib ==0.7.6
|
||||
- matplotlib ==0.7.7
|
||||
- matrices ==0.5.0
|
||||
- matrix ==0.3.6.1
|
||||
- matrix-as-xyz ==0.1.2.2
|
||||
|
@ -1490,7 +1490,7 @@ default-package-overrides:
|
|||
- microlens-contra ==0.1.0.2
|
||||
- microlens-ghc ==0.4.13.1
|
||||
- microlens-mtl ==0.2.0.1
|
||||
- microlens-platform ==0.4.2
|
||||
- microlens-platform ==0.4.2.1
|
||||
- microlens-process ==0.2.0.2
|
||||
- microlens-th ==0.4.3.10
|
||||
- microspec ==0.2.1.3
|
||||
|
@ -1507,7 +1507,7 @@ default-package-overrides:
|
|||
- minio-hs ==1.5.3
|
||||
- miniutter ==0.5.1.1
|
||||
- min-max-pqueue ==0.1.0.2
|
||||
- mintty ==0.1.2
|
||||
- mintty ==0.1.3
|
||||
- missing-foreign ==0.1.1
|
||||
- mixed-types-num ==0.5.9.1
|
||||
- mltool ==0.2.0.1
|
||||
|
@ -1661,7 +1661,7 @@ default-package-overrides:
|
|||
- nvim-hs-contrib ==2.0.0.0
|
||||
- nvim-hs-ghcid ==2.0.0.0
|
||||
- oauthenticated ==0.2.1.0
|
||||
- ObjectName ==1.1.0.1
|
||||
- ObjectName ==1.1.0.2
|
||||
- o-clock ==1.2.1
|
||||
- odbc ==0.2.5
|
||||
- oeis2 ==1.0.5
|
||||
|
@ -1673,7 +1673,7 @@ default-package-overrides:
|
|||
- OneTuple ==0.2.2.1
|
||||
- Only ==0.1
|
||||
- oo-prototypes ==0.1.0.0
|
||||
- opaleye ==0.7.6.1
|
||||
- opaleye ==0.7.6.2
|
||||
- OpenAL ==1.7.0.5
|
||||
- openapi3 ==3.1.0
|
||||
- open-browser ==0.2.1.0
|
||||
|
@ -1687,7 +1687,7 @@ default-package-overrides:
|
|||
- opentelemetry-extra ==0.7.0
|
||||
- opentelemetry-lightstep ==0.7.0
|
||||
- opentelemetry-wai ==0.7.0
|
||||
- operational ==0.2.4.0
|
||||
- operational ==0.2.4.1
|
||||
- operational-class ==0.3.0.0
|
||||
- optics ==0.3
|
||||
- optics-core ==0.3.0.1
|
||||
|
@ -1697,7 +1697,7 @@ default-package-overrides:
|
|||
- optional-args ==1.0.2
|
||||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.16.1.0
|
||||
- optparse-generic ==1.4.6
|
||||
- optparse-generic ==1.4.7
|
||||
- optparse-simple ==0.1.1.4
|
||||
- optparse-text ==0.1.1.0
|
||||
- ordered-containers ==0.2.2
|
||||
|
@ -1882,7 +1882,7 @@ default-package-overrides:
|
|||
- pureMD5 ==2.1.4
|
||||
- purescript-bridge ==0.14.0.0
|
||||
- pushbullet-types ==0.4.1.0
|
||||
- pusher-http-haskell ==2.1.0.5
|
||||
- pusher-http-haskell ==2.1.0.6
|
||||
- pvar ==1.0.0.0
|
||||
- PyF ==0.9.0.3
|
||||
- qchas ==1.1.0.1
|
||||
|
@ -1910,7 +1910,7 @@ default-package-overrides:
|
|||
- rainbow ==0.34.2.2
|
||||
- rainbox ==0.26.0.0
|
||||
- ral ==0.2
|
||||
- rampart ==1.1.0.3
|
||||
- rampart ==1.1.0.4
|
||||
- ramus ==0.1.2
|
||||
- rando ==0.0.0.4
|
||||
- random ==1.2.0
|
||||
|
@ -1927,12 +1927,12 @@ default-package-overrides:
|
|||
- rank2classes ==1.4.3
|
||||
- Rasterific ==0.7.5.4
|
||||
- rasterific-svg ==0.3.3.2
|
||||
- ratel ==1.0.16
|
||||
- ratel ==1.0.17
|
||||
- rate-limit ==1.4.2
|
||||
- ratel-wai ==1.1.5
|
||||
- rattle ==0.2
|
||||
- rattletrap ==11.1.1
|
||||
- Rattus ==0.5
|
||||
- Rattus ==0.5.0.1
|
||||
- rawfilepath ==0.2.4
|
||||
- rawstring-qm ==0.2.3.0
|
||||
- raw-strings-qq ==1.1
|
||||
|
@ -1945,7 +1945,7 @@ default-package-overrides:
|
|||
- read-env-var ==1.0.0.0
|
||||
- reanimate ==1.1.4.0
|
||||
- reanimate-svg ==0.13.0.1
|
||||
- rebase ==1.13.0.1
|
||||
- rebase ==1.13.1
|
||||
- record-dot-preprocessor ==0.2.13
|
||||
- record-hasfield ==1.0
|
||||
- records-sop ==0.1.1.0
|
||||
|
@ -1989,7 +1989,7 @@ default-package-overrides:
|
|||
- repline ==0.4.0.0
|
||||
- req ==3.9.0
|
||||
- req-conduit ==1.0.1
|
||||
- rerebase ==1.13.0.1
|
||||
- rerebase ==1.13.1
|
||||
- rescue ==0.4.2.1
|
||||
- resistor-cube ==0.0.1.2
|
||||
- resolv ==0.1.2.0
|
||||
|
@ -2142,7 +2142,7 @@ default-package-overrides:
|
|||
- show-combinators ==0.2.0.0
|
||||
- siggy-chardust ==1.0.0
|
||||
- signal ==0.1.0.4
|
||||
- silently ==1.2.5.1
|
||||
- silently ==1.2.5.2
|
||||
- simple-affine-space ==0.1.1
|
||||
- simple-cabal ==0.1.3
|
||||
- simple-cmd ==0.2.3
|
||||
|
@ -2157,7 +2157,7 @@ default-package-overrides:
|
|||
- singleton-bool ==0.1.5
|
||||
- singleton-nats ==0.4.5
|
||||
- singletons ==2.7
|
||||
- singletons-presburger ==0.6.0.0
|
||||
- singletons-presburger ==0.6.1.0
|
||||
- siphash ==1.0.3
|
||||
- Sit ==0.2021.1.18
|
||||
- sitemap-gen ==0.1.0.0
|
||||
|
@ -2249,7 +2249,7 @@ default-package-overrides:
|
|||
- streaming ==0.2.3.0
|
||||
- streaming-attoparsec ==1.0.0.1
|
||||
- streaming-bytestring ==0.2.1
|
||||
- streaming-commons ==0.2.2.1
|
||||
- streaming-commons ==0.2.2.2
|
||||
- streamly ==0.7.3
|
||||
- streams ==3.3
|
||||
- streamt ==0.5.0.0
|
||||
|
@ -2284,10 +2284,10 @@ default-package-overrides:
|
|||
- swagger ==0.3.0
|
||||
- swagger2 ==2.6
|
||||
- sweet-egison ==0.1.1.3
|
||||
- swish ==0.10.0.7
|
||||
- swish ==0.10.0.8
|
||||
- syb ==0.7.2.1
|
||||
- sydtest ==0.2.0.0
|
||||
- sydtest-discover ==0.0.0.0
|
||||
- sydtest-discover ==0.0.0.1
|
||||
- sydtest-persistent-sqlite ==0.1.0.0
|
||||
- sydtest-servant ==0.1.0.0
|
||||
- sydtest-wai ==0.1.0.0
|
||||
|
@ -2371,7 +2371,7 @@ default-package-overrides:
|
|||
- text-manipulate ==0.3.0.0
|
||||
- text-metrics ==0.3.1
|
||||
- text-postgresql ==0.0.3.1
|
||||
- text-printer ==0.5.0.1
|
||||
- text-printer ==0.5.0.2
|
||||
- text-regex-replace ==0.1.1.4
|
||||
- text-region ==0.3.1.0
|
||||
- text-short ==0.1.3
|
||||
|
@ -2409,7 +2409,7 @@ default-package-overrides:
|
|||
- through-text ==0.1.0.0
|
||||
- throwable-exceptions ==0.1.0.9
|
||||
- th-strict-compat ==0.1.0.1
|
||||
- th-test-utils ==1.1.0
|
||||
- th-test-utils ==1.1.1
|
||||
- th-utilities ==0.2.4.3
|
||||
- thyme ==0.3.5.5
|
||||
- tidal ==1.7.8
|
||||
|
@ -2497,8 +2497,8 @@ default-package-overrides:
|
|||
- unexceptionalio ==0.5.1
|
||||
- unexceptionalio-trans ==0.5.1
|
||||
- unicode ==0.0.1.1
|
||||
- unicode-collation ==0.1.3
|
||||
- unicode-show ==0.1.0.4
|
||||
- unicode-collation ==0.1.3.1
|
||||
- unicode-show ==0.1.0.5
|
||||
- unicode-transforms ==0.3.7.1
|
||||
- unification-fd ==0.11.1
|
||||
- union-angle ==0.1.0.1
|
||||
|
@ -2528,7 +2528,7 @@ default-package-overrides:
|
|||
- unliftio-pool ==0.2.1.1
|
||||
- unliftio-streams ==0.1.1.1
|
||||
- unlit ==0.4.0.0
|
||||
- unordered-containers ==0.2.14.0
|
||||
- unordered-containers ==0.2.15.0
|
||||
- unsafe ==0.0
|
||||
- urbit-hob ==0.3.3
|
||||
- uri-bytestring ==0.3.3.1
|
||||
|
@ -2575,7 +2575,7 @@ default-package-overrides:
|
|||
- vector-sized ==1.4.4
|
||||
- vector-space ==0.16
|
||||
- vector-split ==1.0.0.2
|
||||
- vector-th-unbox ==0.2.1.9
|
||||
- vector-th-unbox ==0.2.2
|
||||
- verbosity ==0.4.0.0
|
||||
- versions ==5.0.0
|
||||
- vformat ==0.14.1.0
|
||||
|
@ -2604,7 +2604,7 @@ default-package-overrides:
|
|||
- wai-rate-limit-redis ==0.1.0.0
|
||||
- wai-saml2 ==0.2.1.2
|
||||
- wai-session ==0.3.3
|
||||
- wai-session-redis ==0.1.0.3
|
||||
- wai-session-redis ==0.1.0.4
|
||||
- wai-slack-middleware ==0.2.0
|
||||
- wai-websockets ==3.0.1.2
|
||||
- wakame ==0.1.0.0
|
||||
|
@ -2633,7 +2633,7 @@ default-package-overrides:
|
|||
- witherable ==0.4.2
|
||||
- within ==0.2.0.1
|
||||
- with-location ==0.1.0
|
||||
- with-utf8 ==1.0.2.2
|
||||
- with-utf8 ==1.0.2.3
|
||||
- wizards ==1.0.3
|
||||
- wl-pprint-annotated ==0.1.0.1
|
||||
- wl-pprint-console ==0.1.0.2
|
||||
|
|
|
@ -992,6 +992,7 @@ dont-distribute-packages:
|
|||
- domain-core
|
||||
- domain-optics
|
||||
- dormouse-client
|
||||
- dovetail-aeson
|
||||
- dow
|
||||
- download-media-content
|
||||
- dph-examples
|
||||
|
@ -1228,9 +1229,11 @@ dont-distribute-packages:
|
|||
- ghcjs-hplay
|
||||
- ght
|
||||
- gi-cairo-again
|
||||
- gi-clutter
|
||||
- gi-coglpango
|
||||
- gi-gsk
|
||||
- gi-gstpbutils
|
||||
- gi-gtk_4_0_4
|
||||
- gi-gtk_4_0_5
|
||||
- git-fmt
|
||||
- git-gpush
|
||||
- git-object
|
||||
|
@ -2381,10 +2384,14 @@ dont-distribute-packages:
|
|||
- polydata
|
||||
- polysemy-RandomFu
|
||||
- polysemy-check
|
||||
- polysemy-conc
|
||||
- polysemy-http
|
||||
- polysemy-log
|
||||
- polysemy-log-co
|
||||
- polysemy-log-di
|
||||
- polysemy-methodology-co-log
|
||||
- polysemy-optics
|
||||
- polysemy-process
|
||||
- polysemy-readline
|
||||
- polysemy-resume
|
||||
- polysemy-webserver
|
||||
|
|
|
@ -854,6 +854,12 @@ self: super: builtins.intersectAttrs super {
|
|||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-pragmas-plugin;
|
||||
hls-hlint-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
}) super.hls-hlint-plugin;
|
||||
hiedb = overrideCabal (drv: {
|
||||
preCheck = ''
|
||||
export PATH=$PWD/dist/build/hiedb:$PATH
|
||||
|
|
3770
pkgs/development/haskell-modules/hackage-packages.nix
generated
3770
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -1,5 +1,14 @@
|
|||
{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
|
||||
, withLLVM ? !(stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isPowerPC)
|
||||
# Include LLVM by default if GHC doesn't have native code generation support
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
|
||||
, useLLVM ? !(lib.any lib.id ([
|
||||
stdenv.targetPlatform.isx86
|
||||
stdenv.targetPlatform.isPowerPC
|
||||
stdenv.targetPlatform.isSparc
|
||||
] ++ lib.optionals (lib.versionAtLeast ghc.version "9.2") [
|
||||
(stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)
|
||||
# TODO(@sternenseemann): Is armv7a supported for iOS?
|
||||
]))
|
||||
, postBuild ? ""
|
||||
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
|
||||
}:
|
||||
|
@ -50,7 +59,7 @@ let
|
|||
([ llvmPackages.llvm ]
|
||||
++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang);
|
||||
in
|
||||
if paths == [] && !withLLVM then ghc else
|
||||
if paths == [] && !useLLVM then ghc else
|
||||
symlinkJoin {
|
||||
# this makes computing paths from the name attribute impossible;
|
||||
# if such a feature is needed, the real compiler name should be saved
|
||||
|
@ -73,7 +82,7 @@ symlinkJoin {
|
|||
${lib.optionalString (ghc.isGhcjs or false)
|
||||
''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"''
|
||||
} \
|
||||
${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''}
|
||||
${lib.optionalString useLLVM ''--prefix "PATH" ":" "${llvm}"''}
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
|
@ -23,12 +23,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "autobahn";
|
||||
version = "21.3.1";
|
||||
version = "21.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "00wf9dkfgakg80gy62prg650lb8zz9y9fdlxwxcznwp8hgsw29p1";
|
||||
sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -64,9 +66,13 @@ buildPythonPackage rec {
|
|||
export USE_ASYNCIO=1
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [ "--pyargs autobahn" ];
|
||||
pytestFlagsArray = [
|
||||
"--pyargs autobahn"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "autobahn" ];
|
||||
pythonImportsCheck = [
|
||||
"autobahn"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WebSocket and WAMP in Python for Twisted and asyncio";
|
||||
|
|
|
@ -20,13 +20,16 @@ buildPythonPackage rec {
|
|||
# authors seem to have created their own build system
|
||||
format = "other";
|
||||
|
||||
# tarball doesn't appear to have been shipped totally ready-to-build
|
||||
postPatch = ''
|
||||
# tarball doesn't appear to have been shipped totally ready-to-build
|
||||
substituteInPlace ci/ext.py \
|
||||
--replace \
|
||||
'shell_cmd(["git"' \
|
||||
'"0000000000000000000000000000000000000000" or shell_cmd(["git"'
|
||||
echo '${version}' > VERSION.txt
|
||||
|
||||
# don't make assumptions about architecture
|
||||
sed -i '/-m64/d' ci/ext.py
|
||||
'';
|
||||
DT_RELEASE = "1";
|
||||
|
||||
|
|
|
@ -4,19 +4,23 @@
|
|||
, pyserial
|
||||
, pyserial-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, tailer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dsmr-parser";
|
||||
version = "0.30";
|
||||
version = "0.31";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndokter";
|
||||
repo = "dsmr_parser";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3RXku0L/XQFarECxY1LSs2TwSOlJAOiS6yEepHCGL5U=";
|
||||
sha256 = "sha256-A+fyAAV62Dg28RDiivKEjrC1bCXzkuIvpATR+oUytRU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -30,7 +34,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dsmr_parser" ];
|
||||
pythonImportsCheck = [
|
||||
"dsmr_parser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, requests, iso8601, bottle, pytestCheckHook }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, requests, iso8601, bottle, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "m3u8";
|
||||
|
@ -11,6 +11,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-EfHhmV2otEgEy2OVohS+DF7dk97GFdWZ4cFCERZBmlA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix hardcoded /tmp dir (fix build on Hydra)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/globocom/m3u8/commit/cf7ae5fda4681efcea796cd7c51c02f152c36009.patch";
|
||||
sha256 = "sha256-SEETpIJQddid8D//6DVrSGs/BqDeMOzufE0bBrm+/xY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ requests iso8601 ];
|
||||
|
||||
checkInputs = [ bottle pytestCheckHook ];
|
||||
|
@ -21,11 +29,6 @@ buildPythonPackage rec {
|
|||
"tests/test_variant_m3u8.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Fix test on Hydra
|
||||
substituteInPlace tests/test_model.py --replace "/tmp/d.m3u8" "$TMPDIR/d.m3u8"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/globocom/m3u8";
|
||||
description = "Python m3u8 parser";
|
||||
|
|
|
@ -3,15 +3,9 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, beautifulsoup4
|
||||
, bottleneck
|
||||
, cython
|
||||
, numpy
|
||||
, python-dateutil
|
||||
, html5lib
|
||||
, jinja2
|
||||
, lxml
|
||||
, numexpr
|
||||
, openpyxl
|
||||
, pytz
|
||||
, scipy
|
||||
, sqlalchemy
|
||||
|
@ -21,6 +15,7 @@
|
|||
# Test inputs
|
||||
, glibcLocales
|
||||
, hypothesis
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, pytest-xdist
|
||||
, pytest-asyncio
|
||||
|
@ -44,19 +39,9 @@ buildPythonPackage rec {
|
|||
buildInputs = lib.optional stdenv.isDarwin libcxx;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
bottleneck
|
||||
numpy
|
||||
python-dateutil
|
||||
html5lib
|
||||
numexpr
|
||||
lxml
|
||||
openpyxl
|
||||
pytz
|
||||
scipy
|
||||
sqlalchemy
|
||||
tables
|
||||
xlrd
|
||||
xlwt
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -11,14 +11,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykulersky";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1fzfixnl28rny7c3wr6gcdpqhyrz7z2aqq6qfwkxnkq2kqdbpmmg";
|
||||
sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,7 +34,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pykulersky" ];
|
||||
pythonImportsCheck = [
|
||||
"pykulersky"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to control Brightech Kuler Sky Bluetooth LED devices";
|
||||
|
|
|
@ -12,14 +12,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyzerproc";
|
||||
version = "0.4.9";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.4.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "11bsvmvazx9gpj0w80b6wgdp41z8y2sk6bhkj3ps7grsgr59n7rz";
|
||||
sha256 = "sha256-sfxyHpJzYYwxLsvfJpqI6cC/CKS7Jx0vXSLL3QD9qV4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -39,7 +41,9 @@ buildPythonPackage rec {
|
|||
asynctest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyzerproc" ];
|
||||
pythonImportsCheck = [
|
||||
"pyzerproc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to control Zerproc Bluetooth LED smart string lights";
|
||||
|
|
|
@ -1,34 +1,25 @@
|
|||
{stdenv, lib, fetchFromGitHub, ldc, curl}:
|
||||
{stdenv, lib, fetchFromGitHub, fetchpatch, ldc, curl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dtools";
|
||||
version = "2.095.1";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "dmd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
|
||||
name = "dmd";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
|
||||
name = "dtools";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlang";
|
||||
repo = "tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
|
||||
name = "dtools";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# part of https://github.com/dlang/tools/pull/441
|
||||
url = "https://github.com/dlang/tools/commit/6c6a042d1b08e3ec1790bd07a7f69424625ee866.patch"; # Fix LDC arm64 build
|
||||
sha256 = "sha256-x6EclTYN1Y5FG57KLhbBK0BZicSYcZoWO7MTVcP4T18=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
postUnpack = ''
|
||||
mv dmd dtools
|
||||
cd dtools
|
||||
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ldc ];
|
||||
buildInputs = [ curl ];
|
||||
|
||||
|
|
|
@ -452,6 +452,16 @@ self: super:
|
|||
});
|
||||
|
||||
xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {
|
||||
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/issues/12
|
||||
postPatch = ''
|
||||
patch -p1 <<EOF
|
||||
--- a/src/qxl_option_helpers.c
|
||||
+++ b/src/qxl_option_helpers.c
|
||||
@@ -37 +37 @@
|
||||
- return options[option_index].value.bool;
|
||||
+ return options[option_index].value.boolean;
|
||||
EOF
|
||||
'';
|
||||
buildInputs = attrs.buildInputs ++ [ spice-protocol ];
|
||||
});
|
||||
|
||||
|
@ -648,6 +658,14 @@ self: super:
|
|||
#
|
||||
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail
|
||||
./dont-create-logdir-during-build.patch
|
||||
|
||||
# Fix e.g. xorg.xf86videovmware with libdrm 2.4.108
|
||||
# TODO: remove with xorgserver >= 1.21
|
||||
(fetchpatch {
|
||||
name = "stdbool.patch";
|
||||
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff";
|
||||
sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy";
|
||||
})
|
||||
];
|
||||
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
|
||||
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.10.0";
|
||||
version = "5.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JXjlK/XTIJeJj8do7JsoZQ8kE+bgy6czXAam/cj7IQo=";
|
||||
sha256 = "sha256-vBsjCSbgVo2kQJLB/ZyAG2F+80mVA3UF2RN+O0YQbhs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";
|
||||
|
|
Loading…
Reference in a new issue