Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3150d34bb3
@ -45,6 +45,7 @@ lua-resty-jwt,,,,,,
|
||||
lua-resty-openidc,,,,,,
|
||||
lua-resty-openssl,,,,,,
|
||||
lua-resty-session,,,,,,
|
||||
lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,lua5_1,scoder12
|
||||
lua-term,,,,,,
|
||||
lua-toml,,,,,,
|
||||
lua-zlib,,,,,,koral
|
||||
|
||||
|
@ -10,30 +10,26 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "2.12.0";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4=";
|
||||
hash = "sha256-2h+fy4KMxFrVtKJBtA1RmJDZv0OVm1BxO1akZzAw95Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "grandalf==0.6" "grandalf" \
|
||||
--replace "scmrepo==0.0.25" "scmrepo" \
|
||||
--replace "dvc-data==0.0.16" "dvc-data" \
|
||||
--replace "dvc-render==0.0.6" "dvc-render" \
|
||||
--replace "setuptools_scm_git_archive==1.1" "setuptools_scm_git_archive"
|
||||
--replace "scmrepo==0.0.25" "scmrepo"
|
||||
substituteInPlace dvc/daemon.py \
|
||||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
setuptools-scm-git-archive
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -41,7 +37,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
appdirs
|
||||
colorama
|
||||
configobj
|
||||
configobj
|
||||
dictdiffer
|
||||
diskcache
|
||||
distro
|
||||
@ -49,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
dvclive
|
||||
dvc-data
|
||||
dvc-render
|
||||
dvc-task
|
||||
flatten-dict
|
||||
flufl_lock
|
||||
funcy
|
||||
@ -70,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
shortuuid
|
||||
shtab
|
||||
tabulate
|
||||
toml
|
||||
tomlkit
|
||||
tqdm
|
||||
typing-extensions
|
||||
voluptuous
|
||||
@ -100,8 +96,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
description = "Version Control System for Machine Learning Projects";
|
||||
homepage = "https://dvc.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmcdragonkai fab ];
|
||||
# ImportError: cannot import name 'GDriveAuthError' from 'dvc_objects.fs.implementations.gdrive'
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ cmcdragonkai fab anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation,
|
||||
qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full,
|
||||
CoreFoundation }:
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, pkg-config, which, qmake, wrapQtAppsHook
|
||||
, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "olive-editor";
|
||||
version = "0.1.2";
|
||||
|
||||
|
||||
@ -133,18 +133,6 @@ stdenv.mkDerivation rec {
|
||||
# Otherwise tries to ensure /var/run exists.
|
||||
sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \
|
||||
qga/meson.build
|
||||
|
||||
# glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will
|
||||
# rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition.
|
||||
#
|
||||
# `has_statx` will be set to `true` if a simple C program which uses a few `statx`
|
||||
# consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33
|
||||
# since most likely[2] and because of that, the problematic code-path will be used.
|
||||
#
|
||||
# [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a
|
||||
# [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c
|
||||
substituteInPlace meson.build \
|
||||
--replace 'has_statx = cc.links(statx_test)' 'has_statx = false'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "219207531a7a2e12e857b3ec55a7573f0a0f34d2",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/219207531a7a2e12e857b3ec55a7573f0a0f34d2.tar.gz",
|
||||
"sha256": "146y45g6f1vvc3f8p1dq56y1fk1ls7v814iwa736k08ah6jfrq4f",
|
||||
"msg": "Update from Hackage at 2022-07-31T09:12:37Z"
|
||||
"commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz",
|
||||
"sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4",
|
||||
"msg": "Update from Hackage at 2022-08-07T14:05:30Z"
|
||||
}
|
||||
|
||||
@ -833,9 +833,9 @@ self: super: {
|
||||
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
|
||||
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
|
||||
}) (super.sensei.override {
|
||||
hspec = self.hspec_2_10_0;
|
||||
hspec = self.hspec_2_10_0_1;
|
||||
hspec-wai = super.hspec-wai.override {
|
||||
hspec = self.hspec_2_10_0;
|
||||
hspec = self.hspec_2_10_0_1;
|
||||
};
|
||||
});
|
||||
|
||||
@ -1646,14 +1646,14 @@ self: super: {
|
||||
servant-openapi3 = dontCheck super.servant-openapi3;
|
||||
|
||||
# Give hspec 2.10.* correct dependency versions without overrideScope
|
||||
hspec_2_10_0 = doDistribute (super.hspec_2_10_0.override {
|
||||
hspec-discover = self.hspec-discover_2_10_0;
|
||||
hspec-core = self.hspec-core_2_10_0;
|
||||
hspec_2_10_0_1 = doDistribute (super.hspec_2_10_0_1.override {
|
||||
hspec-discover = self.hspec-discover_2_10_0_1;
|
||||
hspec-core = self.hspec-core_2_10_0_1;
|
||||
});
|
||||
hspec-discover_2_10_0 = super.hspec-discover_2_10_0.override {
|
||||
hspec-discover_2_10_0_1 = super.hspec-discover_2_10_0_1.override {
|
||||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
};
|
||||
hspec-core_2_10_0 = super.hspec-core_2_10_0.override {
|
||||
hspec-core_2_10_0_1 = super.hspec-core_2_10_0_1.override {
|
||||
hspec-meta = self.hspec-meta_2_9_3;
|
||||
};
|
||||
|
||||
@ -2357,6 +2357,10 @@ self: super: {
|
||||
# https://github.com/tree-sitter/haskell-tree-sitter/issues/298
|
||||
tree-sitter = doJailbreak super.tree-sitter;
|
||||
|
||||
# 2022-08-07: Bounds are too restrictive: https://github.com/marcin-rzeznicki/libjwt-typed/issues/2
|
||||
# Also, the tests fail.
|
||||
libjwt-typed = dontCheck (doJailbreak super.libjwt-typed);
|
||||
|
||||
# Test suite fails to compile
|
||||
# https://github.com/kuribas/mfsolve/issues/8
|
||||
mfsolve = dontCheck super.mfsolve;
|
||||
@ -2622,4 +2626,11 @@ in {
|
||||
purescript-ast = purescriptStOverride super.purescript-ast;
|
||||
|
||||
purenix = purescriptStOverride super.purenix;
|
||||
|
||||
# Needs update for ghc-9:
|
||||
# https://github.com/haskell/text-format/issues/27
|
||||
text-format = appendPatch (fetchpatch {
|
||||
url = "https://github.com/hackage-trustees/text-format/pull/4/commits/949383aa053497b8c251219c10506136c29b4d32.patch";
|
||||
sha256 = "QzpZ7lDedsz1mZcq6DL4x7LBnn58rx70+ZVvPh9shRo=";
|
||||
}) super.text-format;
|
||||
})
|
||||
|
||||
@ -113,7 +113,7 @@ self: super: {
|
||||
lifted-async = doJailbreak super.lifted-async;
|
||||
lukko = doJailbreak super.lukko;
|
||||
lzma-conduit = doJailbreak super.lzma-conduit;
|
||||
ormolu = self.ormolu_0_5_0_0;
|
||||
ormolu = self.ormolu_0_5_0_1;
|
||||
parallel = doJailbreak super.parallel;
|
||||
path = doJailbreak super.path;
|
||||
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
|
||||
|
||||
@ -357,6 +357,7 @@ broken-packages:
|
||||
- bindings-apr
|
||||
- bindings-bfd
|
||||
- bindings-cctools
|
||||
- bindings-common
|
||||
- bindings-dc1394
|
||||
- bindings-eskit
|
||||
- bindings-EsounD
|
||||
@ -970,6 +971,7 @@ broken-packages:
|
||||
- data-diverse
|
||||
- datadog
|
||||
- data-easy
|
||||
- data-elevator
|
||||
- data-embed
|
||||
- data-emoticons
|
||||
- data-filepath
|
||||
@ -1176,6 +1178,7 @@ broken-packages:
|
||||
- dpor
|
||||
- dragen
|
||||
- drawille
|
||||
- dr-cabal
|
||||
- drClickOn
|
||||
- dresdner-verkehrsbetriebe
|
||||
- DrIFT
|
||||
@ -1435,6 +1438,7 @@ broken-packages:
|
||||
- file-command-qq
|
||||
- filediff
|
||||
- file-embed-poly
|
||||
- file-io
|
||||
- file-location
|
||||
- FileManip
|
||||
- FileManipCompat
|
||||
@ -1691,6 +1695,7 @@ broken-packages:
|
||||
- ghcup
|
||||
- ghc-usage
|
||||
- gh-labeler
|
||||
- gi-adwaita
|
||||
- giak
|
||||
- gi-cogl
|
||||
- Gifcurry
|
||||
@ -2306,6 +2311,7 @@ broken-packages:
|
||||
- houseman
|
||||
- hp2any-core
|
||||
- hpack-convert
|
||||
- hpapi
|
||||
- hpasteit
|
||||
- HPath
|
||||
- hpc-coveralls
|
||||
@ -2518,6 +2524,7 @@ broken-packages:
|
||||
- hunit-rematch
|
||||
- hunspell-hs
|
||||
- hup
|
||||
- hurl
|
||||
- hurriyet
|
||||
- husky
|
||||
- hutton
|
||||
@ -2939,7 +2946,6 @@ broken-packages:
|
||||
- libhbb
|
||||
- libinfluxdb
|
||||
- libjenkins
|
||||
- libjwt-typed
|
||||
- libltdl
|
||||
- liboath-hs
|
||||
- liboleg
|
||||
@ -4135,6 +4141,7 @@ broken-packages:
|
||||
- rand-vars
|
||||
- Range
|
||||
- rangemin
|
||||
- rangeset
|
||||
- rank1dynamic
|
||||
- rank-product
|
||||
- rapid-term
|
||||
@ -4683,6 +4690,7 @@ broken-packages:
|
||||
- SNet
|
||||
- snipcheck
|
||||
- snorkels
|
||||
- snowchecked
|
||||
- snowtify
|
||||
- socket-activation
|
||||
- socketed
|
||||
@ -5033,7 +5041,6 @@ broken-packages:
|
||||
- text-ascii
|
||||
- text-builder-linear
|
||||
- text-containers
|
||||
- text-format
|
||||
- text-format-heavy
|
||||
- text-generic-pretty
|
||||
- text-icu-normalized
|
||||
@ -5739,7 +5746,9 @@ broken-packages:
|
||||
- zeno
|
||||
- zeolite-lang
|
||||
- zephyr
|
||||
- zeromq4-clone-pattern
|
||||
- zeromq4-conduit
|
||||
- zeromq4-patterns
|
||||
- zeromq-haskell
|
||||
- zettelkast
|
||||
- ZFS
|
||||
|
||||
@ -446,6 +446,7 @@ unsupported-platforms:
|
||||
grid-proto: [ platforms.darwin ]
|
||||
gtk-sni-tray: [ platforms.darwin ]
|
||||
haskell-snake: [ platforms.darwin ]
|
||||
hb3sum: [ aarch64-linux ] # depends on blake3, which is not supported on aarch64-linux
|
||||
hcwiid: [ platforms.darwin ]
|
||||
HDRUtils: [ platforms.darwin ]
|
||||
hidapi: [ platforms.darwin ]
|
||||
@ -539,8 +540,10 @@ supported-platforms:
|
||||
hw-prim-bits: [ platforms.x86 ] # x86 assembler
|
||||
inline-asm: [ platforms.x86 ] # x86 assembler
|
||||
keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-frp-banana: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-geometry: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-render-basic: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-resource-gltf: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-sound-openal: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
keid-ui-dearimgui: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
|
||||
kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ]
|
||||
@ -644,3 +647,6 @@ dont-distribute-packages:
|
||||
|
||||
# mesos was removed from nixpkgs
|
||||
- hs-mesos
|
||||
|
||||
# Output exceeds Hydra's maximum allowable size
|
||||
- stripeapi
|
||||
|
||||
@ -693,7 +693,6 @@ dont-distribute-packages:
|
||||
- aws-dynamodb-conduit
|
||||
- aws-dynamodb-streams
|
||||
- aws-easy
|
||||
- aws-ec2-knownhosts
|
||||
- aws-elastic-transcoder
|
||||
- aws-kinesis
|
||||
- aws-kinesis-client
|
||||
@ -857,9 +856,7 @@ dont-distribute-packages:
|
||||
- cabal2json
|
||||
- cabalmdvrpm
|
||||
- cabalrpmdeps
|
||||
- cabocha
|
||||
- cake
|
||||
- cake3
|
||||
- cakyrespa
|
||||
- cal3d-examples
|
||||
- cal3d-opengl
|
||||
@ -1273,7 +1270,6 @@ dont-distribute-packages:
|
||||
- dtd
|
||||
- dtw
|
||||
- dumb-cas
|
||||
- duplo
|
||||
- dvda
|
||||
- dynamic-cabal
|
||||
- dynamic-plot
|
||||
@ -1506,7 +1502,6 @@ dont-distribute-packages:
|
||||
- gbu
|
||||
- gdax
|
||||
- gdiff-ig
|
||||
- gedcom
|
||||
- geek
|
||||
- geek-server
|
||||
- gelatin-freetype2
|
||||
@ -1549,6 +1544,7 @@ dont-distribute-packages:
|
||||
- gi-cairo-again
|
||||
- gi-clutter
|
||||
- gi-coglpango
|
||||
- gi-ges
|
||||
- gi-gsk
|
||||
- gi-gstpbutils
|
||||
- gi-gtk_4_0_5
|
||||
@ -1905,7 +1901,6 @@ dont-distribute-packages:
|
||||
- hashes
|
||||
- hashflare
|
||||
- hask-home
|
||||
- haskades
|
||||
- haskdeep
|
||||
- haskeem
|
||||
- haskell-aliyun
|
||||
@ -2045,7 +2040,6 @@ dont-distribute-packages:
|
||||
- hesh
|
||||
- hesql
|
||||
- heterolist
|
||||
- hevm
|
||||
- hevolisa
|
||||
- hevolisa-dph
|
||||
- hexpat-conduit
|
||||
@ -2071,7 +2065,6 @@ dont-distribute-packages:
|
||||
- hinvaders
|
||||
- hinze-streams
|
||||
- hipbot
|
||||
- hipe
|
||||
- hipsql-client
|
||||
- hipsql-server
|
||||
- hirt
|
||||
@ -2335,7 +2328,6 @@ dont-distribute-packages:
|
||||
- jmacro-rpc-happstack
|
||||
- jmacro-rpc-snap
|
||||
- jmonkey
|
||||
- jobqueue
|
||||
- join
|
||||
- jsc
|
||||
- jsmw
|
||||
@ -2370,7 +2362,6 @@ dont-distribute-packages:
|
||||
- kansas-lava-papilio
|
||||
- kansas-lava-shake
|
||||
- karakuri
|
||||
- karps
|
||||
- katip-rollbar
|
||||
- keenser
|
||||
- keera-hails-i18n
|
||||
@ -2407,7 +2398,6 @@ dont-distribute-packages:
|
||||
- koji-install
|
||||
- koji-tool
|
||||
- korfu
|
||||
- krapsh
|
||||
- ks-test
|
||||
- kubernetes-client
|
||||
- kure-your-boilerplate
|
||||
@ -2448,7 +2438,6 @@ dont-distribute-packages:
|
||||
- language-qux
|
||||
- language-spelling
|
||||
- lat
|
||||
- latest-npm-version
|
||||
- latex-formulae-hakyll
|
||||
- latex-formulae-pandoc
|
||||
- latex-svg-hakyll
|
||||
@ -2552,11 +2541,9 @@ dont-distribute-packages:
|
||||
- lojysamban
|
||||
- lol-apps
|
||||
- lol-benches
|
||||
- lol-calculus
|
||||
- lol-cpp
|
||||
- lol-repa
|
||||
- lol-tests
|
||||
- lol-typing
|
||||
- loli
|
||||
- loop-effin
|
||||
- looper
|
||||
@ -2647,7 +2634,6 @@ dont-distribute-packages:
|
||||
- micro-gateway
|
||||
- microformats2-parser
|
||||
- microformats2-types
|
||||
- micrologger
|
||||
- midimory
|
||||
- mighttpd
|
||||
- migrant-hdbc
|
||||
@ -2816,7 +2802,6 @@ dont-distribute-packages:
|
||||
- newsynth
|
||||
- ngrams-loader
|
||||
- ngx-export-tools-extra
|
||||
- nicovideo-translator
|
||||
- nikepub
|
||||
- nirum
|
||||
- nix-thunk
|
||||
@ -2964,7 +2949,6 @@ dont-distribute-packages:
|
||||
- phonetic-languages-simplified-properties-lists-double
|
||||
- phonetic-languages-ukrainian
|
||||
- phooey
|
||||
- pia-forward
|
||||
- pianola
|
||||
- pier
|
||||
- ping
|
||||
@ -3082,7 +3066,6 @@ dont-distribute-packages:
|
||||
- push-notify-apn
|
||||
- push-notify-ccs
|
||||
- push-notify-general
|
||||
- pushme
|
||||
- puzzle-draw-cmdline
|
||||
- pvd
|
||||
- qd-vec
|
||||
@ -3412,8 +3395,6 @@ dont-distribute-packages:
|
||||
- servant-streaming-server
|
||||
- servant-swagger-tags
|
||||
- servant-to-elm
|
||||
- servant-util
|
||||
- servant-util-beam-pg
|
||||
- servant-waargonaut
|
||||
- servant-zeppelin-client
|
||||
- servant-zeppelin-server
|
||||
@ -3653,7 +3634,6 @@ dont-distribute-packages:
|
||||
- syntaxnet-haskell
|
||||
- synthesizer-llvm
|
||||
- sys-process
|
||||
- systemstats
|
||||
- t3-client
|
||||
- ta
|
||||
- tag-stream
|
||||
@ -3696,7 +3676,6 @@ dont-distribute-packages:
|
||||
- test-sandbox-compose
|
||||
- test-simple
|
||||
- testbench
|
||||
- text-all
|
||||
- text-builder-dev_0_3_3
|
||||
- text-json-qq
|
||||
- text-locale-encoding
|
||||
@ -3862,7 +3841,6 @@ dont-distribute-packages:
|
||||
- urbit-airlock
|
||||
- urbit-api
|
||||
- ureader
|
||||
- urembed
|
||||
- uri-enumerator
|
||||
- uri-enumerator-file
|
||||
- usb
|
||||
|
||||
@ -315,6 +315,9 @@ self: super: builtins.intersectAttrs super {
|
||||
greenclip = addExtraLibrary pkgs.xorg.libXdmcp super.greenclip;
|
||||
|
||||
# The cabal files for these libraries do not list the required system dependencies.
|
||||
libjwt-typed = overrideCabal (drv: {
|
||||
librarySystemDepends = [ pkgs.libjwt ];
|
||||
}) super.libjwt-typed;
|
||||
miniball = overrideCabal (drv: {
|
||||
librarySystemDepends = [ pkgs.miniball ];
|
||||
}) super.miniball;
|
||||
|
||||
951
pkgs/development/haskell-modules/hackage-packages.nix
generated
951
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfabric";
|
||||
version = "1.14.0";
|
||||
version = "1.15.1";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "ofiwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MmvJV3Pne+bJtC91rdpNMZovoqMgm3gHFJwGH3tchgI=";
|
||||
sha256 = "sha256-uL3L9k9yqdZXQmR1zi8OEIGLAZ8cf7EBnlDhetaMA08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
||||
@ -1357,6 +1357,37 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
lua-subprocess = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, lua
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "subprocess";
|
||||
version = "scm-1";
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/0x0ade/lua-subprocess.git",
|
||||
"rev": "bfa8e97da774141f301cfd1106dca53a30a4de54",
|
||||
"date": "2021-01-09T22:31:54+01:00",
|
||||
"path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess",
|
||||
"sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
disabled = with lua; (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/xlq/lua-subprocess";
|
||||
description = "A Lua module written in C that allows you to create child processes and communicate with them.";
|
||||
maintainers = with lib.maintainers; [ scoder12 ];
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
lua-term = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchurl}:
|
||||
buildLuarocksPackage {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-retry";
|
||||
version = "2.5.6";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "inyutin";
|
||||
repo = "aiohttp_retry";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jyt4YPn3gSgR1YfHYLs+5VCsjAk9Ij+2m5Kzy51CnLk=";
|
||||
hash = "sha256-vMnk7OHXTgFLcnqauAPB/vxVt8bP1To6KTIgNv7Ek+Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -34,6 +34,10 @@ buildPythonPackage rec {
|
||||
"aiohttp_retry"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--asyncio-mode=auto"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Retry client for aiohttp";
|
||||
homepage = "https://github.com/inyutin/aiohttp_retry";
|
||||
|
||||
@ -1,20 +1,28 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, mock
|
||||
, geopy
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipma";
|
||||
version = "3.0.0";
|
||||
version = "3.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LfnatA8CimHIXH3f3T4PatDBIEhh6vlQtI080iu8UEg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgomes";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AF4bwEsAwJ5MoBQieNDFQ00LILJu+bZZttw4T5+6gkk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -22,13 +30,27 @@ buildPythonPackage rec {
|
||||
geopy
|
||||
];
|
||||
|
||||
# Project has no tests included in the PyPI releases
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
freezegun
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyipma" ];
|
||||
pythonImportsCheck = [
|
||||
"pyipma"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/test_auxiliar.py"
|
||||
"tests/test_location.py"
|
||||
"tests/test_sea_forecast.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to retrieve information from Instituto Português do Mar e Atmosfera";
|
||||
description = "Library to retrieve information from Instituto Português do Mar e Atmosfera";
|
||||
homepage = "https://github.com/dgomes/pyipma";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprosegur";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgomes";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-eP8BFEdAJH2qHqqBXPxTaX1OGFggbWb3517G+gBPxhs=";
|
||||
sha256 = "sha256-Spxzyn0gZ1TIHrtt7W0j6VwKnm2Km5vLGZZ//HINyBA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,49 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, pbr
|
||||
, babel
|
||||
, buildPythonApplication
|
||||
, cliff
|
||||
, fetchPypi
|
||||
, iso8601
|
||||
, keystoneauth1
|
||||
, osc-lib
|
||||
, prettytable
|
||||
, oslo-i18n
|
||||
, oslo-serialization
|
||||
, oslo-utils
|
||||
, keystoneauth1
|
||||
, pbr
|
||||
, prettytable
|
||||
, python-swiftclient
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, six
|
||||
, requests-mock
|
||||
, stestr
|
||||
, testscenarios
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-heatclient";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
|
||||
hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pbr
|
||||
babel
|
||||
cliff
|
||||
iso8601
|
||||
keystoneauth1
|
||||
osc-lib
|
||||
prettytable
|
||||
oslo-i18n
|
||||
oslo-serialization
|
||||
oslo-utils
|
||||
keystoneauth1
|
||||
pbr
|
||||
prettytable
|
||||
python-swiftclient
|
||||
pyyaml
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@ -55,13 +57,16 @@ buildPythonApplication rec {
|
||||
checkPhase = ''
|
||||
stestr run -e <(echo "
|
||||
heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file
|
||||
heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url
|
||||
")
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "heatclient" ];
|
||||
pythonImportsCheck = [
|
||||
"heatclient"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client library for Heat built on the Heat orchestration API";
|
||||
description = "Library for Heat built on the Heat orchestration API";
|
||||
homepage = "https://github.com/openstack/python-heatclient";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.openstack.members;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpsm2";
|
||||
version = "11.2.206";
|
||||
version = "11.2.229";
|
||||
|
||||
preConfigure= ''
|
||||
export UDEVDIR=$out/etc/udev
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "intel";
|
||||
repo = "opa-psm2";
|
||||
rev = "PSM2_${version}";
|
||||
sha256 = "sha256-HsM2OaoX+SdbIednX1MWw1M4kkkPwUs5Dm32q2H7Mg4=";
|
||||
sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
30
pkgs/servers/monitoring/prometheus/zfs-exporter.nix
Normal file
30
pkgs/servers/monitoring/prometheus/zfs-exporter.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ buildGoModule
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zfs_exporter";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdf";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
hash = "sha256-FY3P2wmNWyr7mImc1PJs1G2Ae8rZvDzq0kRZfiRTzyc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c=";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/doc/${pname} *.md
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ZFS Exporter for the Prometheus monitoring system";
|
||||
homepage = "https://github.com/pdf/zfs_exporter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,14 +1,17 @@
|
||||
{ fetchurl, lib, stdenv, fetchpatch }:
|
||||
{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nss-mdns";
|
||||
version = "0.10";
|
||||
version = "v0.15.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz";
|
||||
sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lathiat";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M=";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook pkg-config ];
|
||||
# Note: Although `nss-mdns' works by talking to `avahi-daemon', it
|
||||
# doesn't depend on the Avahi libraries. Instead, it contains
|
||||
# hand-written D-Bus code to talk to the Avahi daemon.
|
||||
@ -21,15 +24,6 @@ stdenv.mkDerivation rec {
|
||||
"--localstatedir=/var"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Provide compat definition for libc lacking <nss.h> (e.g. musl)
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch";
|
||||
sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
meta = {
|
||||
description = "The mDNS Name Service Switch (NSS) plug-in";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,6 +1,21 @@
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, asciidoc
|
||||
, makeWrapper, jansson, jose, cryptsetup, curl, libpwquality, luksmeta
|
||||
, coreutils, tpm2-tools
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, asciidoc
|
||||
, makeWrapper
|
||||
, jansson
|
||||
, jose
|
||||
, cryptsetup
|
||||
, curl
|
||||
, libpwquality
|
||||
, luksmeta
|
||||
, coreutils
|
||||
, tpm2-tools
|
||||
, gnugrep
|
||||
, gnused
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -24,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
# We wrap the main clevis binary entrypoint but not the sub-binaries.
|
||||
wrapProgram $out/bin/clevis \
|
||||
--prefix PATH ':' "${tpm2-tools}/bin:${jose}/bin:${placeholder "out"}/bin"
|
||||
--prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ];
|
||||
|
||||
@ -9260,8 +9260,9 @@ with pkgs;
|
||||
|
||||
ola = callPackage ../applications/misc/ola { };
|
||||
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor
|
||||
{ stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; };
|
||||
olive-editor = libsForQt514.callPackage ../applications/video/olive-editor {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation;
|
||||
};
|
||||
|
||||
ombi = callPackage ../servers/ombi { };
|
||||
|
||||
@ -23098,6 +23099,7 @@ with pkgs;
|
||||
prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { };
|
||||
prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
|
||||
|
||||
prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user