Merge branch 'staging-next' into staging
The transmission conflict was non-trivial: - libbrotli added to apparmor rules <1bdda029cd> - apparmor rules rewritten <b280e64078> Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
This commit is contained in:
Jan Tojnar
commit
d9f177eb4d
73 changed files with 365 additions and 304 deletions
|
|
@ -23,6 +23,7 @@ let
|
|||
isAttrs
|
||||
isBool
|
||||
isFunction
|
||||
isList
|
||||
isString
|
||||
length
|
||||
mapAttrs
|
||||
|
|
@ -188,6 +189,9 @@ rec {
|
|||
loadModule = args: fallbackFile: fallbackKey: m:
|
||||
if isFunction m || isAttrs m then
|
||||
unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args)
|
||||
else if isList m then
|
||||
let defs = [{ file = fallbackFile; value = m; }]; in
|
||||
throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}"
|
||||
else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args);
|
||||
|
||||
/*
|
||||
|
|
@ -515,20 +519,11 @@ rec {
|
|||
# yield a value computed from the definitions
|
||||
value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue;
|
||||
|
||||
# Issue deprecation warnings recursively over all nested types of the
|
||||
# given type. But don't recurse if a type with the same name was already
|
||||
# visited before in order to prevent infinite recursion. So this only
|
||||
# warns once per type name.
|
||||
# Returns the new set of visited type names
|
||||
recursiveWarn = visited: type:
|
||||
let
|
||||
maybeWarn = warnIf (type.deprecationMessage != null)
|
||||
"The type `types.${type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${type.deprecationMessage}";
|
||||
in
|
||||
if visited ? ${type.name} then visited
|
||||
else lib.foldl' recursiveWarn (maybeWarn visited // { ${type.name} = null; }) (lib.attrValues type.nestedTypes);
|
||||
warnDeprecation =
|
||||
warnIf (opt.type.deprecationMessage != null)
|
||||
"The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}";
|
||||
|
||||
in builtins.seq (recursiveWarn {} opt.type) opt //
|
||||
in warnDeprecation opt //
|
||||
{ value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
|
||||
inherit (res.defsFinal') highestPrio;
|
||||
definitions = map (def: def.value) res.defsFinal;
|
||||
|
|
|
|||
|
|
@ -272,12 +272,6 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type
|
|||
checkConfigOutput "b a" config.result ./functionTo/list-order.nix
|
||||
checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
|
||||
|
||||
## Type deprecation
|
||||
checkConfigError 'The type `types.simple'\'' of option `simple'\'' defined in .* is deprecated. simple shall not be used' config.simple ./type-deprecation.nix
|
||||
checkConfigError 'The type `types.infinite'\'' of option `infinite'\'' defined in .* is deprecated. infinite shall not be used' config.infinite ./type-deprecation.nix
|
||||
checkConfigError 'The type `types.left'\'' of option `nested'\'' defined in .* is deprecated. left shall not be used' config.nested ./type-deprecation.nix
|
||||
checkConfigError 'The type `types.right'\'' of option `nested'\'' defined in .* is deprecated. right shall not be used' config.nested ./type-deprecation.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib, ... }: {
|
||||
|
||||
options.simple = lib.mkOption {
|
||||
type = lib.mkOptionType {
|
||||
name = "simple";
|
||||
deprecationMessage = "simple shall not be used";
|
||||
};
|
||||
default = throw "";
|
||||
};
|
||||
|
||||
options.infinite = lib.mkOption {
|
||||
type =
|
||||
let
|
||||
t = lib.mkOptionType {
|
||||
name = "infinite";
|
||||
deprecationMessage = "infinite shall not be used";
|
||||
};
|
||||
r = lib.types.either t (lib.types.attrsOf r);
|
||||
in r;
|
||||
default = throw "";
|
||||
};
|
||||
|
||||
options.nested = lib.mkOption {
|
||||
type =
|
||||
let
|
||||
left = lib.mkOptionType {
|
||||
name = "left";
|
||||
deprecationMessage = "left shall not be used";
|
||||
};
|
||||
right = lib.mkOptionType {
|
||||
name = "right";
|
||||
deprecationMessage = "right shall not be used";
|
||||
};
|
||||
in lib.types.either left right;
|
||||
|
||||
default = throw "";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,4 +1,9 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, chromaprint
|
||||
, qt5
|
||||
, enablePlayback ? true
|
||||
, gst_all_1
|
||||
}:
|
||||
|
|
@ -10,34 +15,36 @@ let
|
|||
else
|
||||
pythonPackages.pyqt5
|
||||
;
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.5.6";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc";
|
||||
sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||
++ lib.optionals (pyqt5.multimediaEnabled) [
|
||||
qt5.qtmultimedia.bin
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-vaapi
|
||||
gst_all_1.gst-libav
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-vaapi
|
||||
gst_all_1.gstreamer
|
||||
]
|
||||
;
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyqt5
|
||||
mutagen
|
||||
chromaprint
|
||||
discid
|
||||
dateutil
|
||||
discid
|
||||
fasteners
|
||||
mutagen
|
||||
pyqt5
|
||||
];
|
||||
|
||||
# In order to spare double wrapping, we use:
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@ let
|
|||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM=";
|
||||
sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU=";
|
||||
vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,26 +10,20 @@
|
|||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
||||
pname = "openethereum";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openethereum";
|
||||
repo = "openethereum";
|
||||
rev = "v${version}";
|
||||
sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp";
|
||||
sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki";
|
||||
};
|
||||
|
||||
cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib";
|
||||
cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc";
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.clang
|
||||
llvmPackages.libclang
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isLinux [ systemd ]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "1.8.0";
|
||||
version = "1.9.1";
|
||||
src =
|
||||
if stdenv.isLinux then fetchzip {
|
||||
url = {
|
||||
|
|
@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
|
|||
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
sha256 = {
|
||||
"i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A=";
|
||||
"x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw=";
|
||||
"aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk";
|
||||
"i686-linux" = "1x5khnp6yqrjf513x3y6l38rb121nib7d4aiz4cz7fh029kxjhd1";
|
||||
"x86_64-linux" = "1ar8lzkndl7xzcinv93rzg8q25vb23fggbjkhgchgc5x9wkwk8hw";
|
||||
"aarch64-linux" = "1q81pk6qmp96p1dbhx1ijln8f54rac8r81d4ghqx9v756s9szrr1";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
stripRoot = false;
|
||||
} else fetchurl {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";
|
||||
sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d";
|
||||
sha256 = "0904wwy3wdhfvbkvpdap8141a9gqmn0dw45ikrzsqpg7pv1r2zch";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
|
||||
|
||||
let
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
pname = "devdocs-desktop";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage";
|
||||
sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2";
|
||||
sha256 = "sha256-4ugpzh0Dweae6tKb6uqRhEW9HT+iVIo8MQRbVKTdRFw=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "free42";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dU8c+tpt+4nCWQj3P2rl6CJNtWFcXaYb3ZESg8hAllQ=";
|
||||
sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuzzel";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
|
||||
sha256 = "sha256-n2eXS4NdOBgn48KOJ+0sQeNMKL7OxB8tUB99narQG0o=";
|
||||
sha256 = "sha256-Zg9KrRf2ntg2FU6lhllt/Fd63KJak6zB7hu4ujj/9AI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja scdoc git ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, perl
|
||||
, alsaLib, libevdev, libopus, udev, SDL2
|
||||
, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec
|
||||
, ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec
|
||||
, curl, expat, avahi, enet, libuuid, libva
|
||||
}:
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [
|
||||
alsaLib libevdev libopus udev SDL2
|
||||
ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec
|
||||
ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec
|
||||
xorg.libpthreadstubs curl expat avahi enet libuuid libva
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "lens";
|
||||
version = "4.2.0";
|
||||
version = "4.2.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
|
||||
sha256 = "0g60d1h2dn41qdzdnqavwknqynjqil7s8kcqy01h021r81rdpn2q";
|
||||
sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw";
|
||||
name="${pname}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-It/p2Hk4/fkYgHTPynf7p7zs4ajjo0Fv3yTzhrWUusE=";
|
||||
sha256 = "sha256-Lu1LJ57jF4lMIfQn/zyT2cc/mkc3RPPlu4gI7qv8blI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Vg6SHyQkeUvd2hT0JV32y+F0t/qb81MrgOFcr785a8M=";
|
||||
vendorSha256 = "sha256-fEzA/+iKye8lzH4JoXLPqnwjrXPPNuL8gPPbkYJ1glw=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
CFLAGS = lib.optionals stdenv.isDarwin [
|
||||
"-D_DARWIN_C_SOURCE"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk \
|
||||
--replace curses ncurses \
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "anydesk";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
|
||||
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
|
||||
];
|
||||
sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r";
|
||||
sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk=";
|
||||
sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, usbredirSupport ? spiceSupport, usbredir
|
||||
, xenSupport ? false, xen
|
||||
, cephSupport ? false, ceph
|
||||
, glusterfsSupport ? false, glusterfs, libuuid
|
||||
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
|
||||
, virglSupport ? openGLSupport, virglrenderer
|
||||
, libiscsiSupport ? true, libiscsi
|
||||
|
|
@ -72,6 +73,7 @@ stdenv.mkDerivation rec {
|
|||
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
|
||||
++ optionals xenSupport [ xen ]
|
||||
++ optionals cephSupport [ ceph ]
|
||||
++ optionals glusterfsSupport [ glusterfs libuuid ]
|
||||
++ optionals openGLSupport [ mesa epoxy libdrm ]
|
||||
++ optionals virglSupport [ virglrenderer ]
|
||||
++ optionals libiscsiSupport [ libiscsi ]
|
||||
|
|
@ -142,6 +144,7 @@ stdenv.mkDerivation rec {
|
|||
++ optional gtkSupport "--enable-gtk"
|
||||
++ optional xenSupport "--enable-xen"
|
||||
++ optional cephSupport "--enable-rbd"
|
||||
++ optional glusterfsSupport "--enable-glusterfs"
|
||||
++ optional openGLSupport "--enable-opengl"
|
||||
++ optional virglSupport "--enable-virglrenderer"
|
||||
++ optional tpmSupport "--enable-tpm"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "3.15";
|
||||
version = "3.18";
|
||||
in fetchzip {
|
||||
name = "inter-${version}";
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ in fetchzip {
|
|||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0";
|
||||
sha256 = "sha256-+wbN1vSS8v1Z1VIfDNeY9DB8Kr6v7UnFg37EPPAD7wI=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://rsms.me/inter/";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.12";
|
||||
version = "2.13";
|
||||
in
|
||||
fetchzip {
|
||||
name = "stix-two-${version}";
|
||||
|
||||
url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip";
|
||||
|
||||
sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9";
|
||||
sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
|||
|
|
@ -3,16 +3,11 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-clipman-plugin";
|
||||
version = "1.6.1";
|
||||
sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl";
|
||||
version = "1.6.2";
|
||||
sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6";
|
||||
|
||||
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];
|
||||
|
||||
postPatch = ''
|
||||
# exo-csource has been dropped from exo
|
||||
substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Clipboard manager for Xfce panel";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evcxr";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "evcxr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4=";
|
||||
sha256 = "sha256-89+RZrG/QUo3JY9N5eTiMigUnlUP+wZWRW8PSnCcsrY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4=";
|
||||
cargoSha256 = "sha256-gZLSTWS5cLfJvk4/tv8FG2I2vH3PKljWbJDOflNDmTQ=";
|
||||
|
||||
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
generic = (import ./generic.nix) _args;
|
||||
|
||||
base = callPackage generic (_args // {
|
||||
version = "7.3.27";
|
||||
sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x";
|
||||
version = "7.3.28";
|
||||
sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg";
|
||||
|
||||
# https://bugs.php.net/bug.php?id=76826
|
||||
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
generic = (import ./generic.nix) _args;
|
||||
|
||||
base = callPackage generic (_args // {
|
||||
version = "7.4.16";
|
||||
sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5";
|
||||
version = "7.4.18";
|
||||
sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f";
|
||||
});
|
||||
|
||||
in base.withExtensions ({ all, ... }: with all; ([
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
generic = (import ./generic.nix) _args;
|
||||
|
||||
base = callPackage generic (_args // {
|
||||
version = "8.0.3";
|
||||
sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m";
|
||||
version = "8.0.5";
|
||||
sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r";
|
||||
});
|
||||
|
||||
in base.withExtensions ({ all, ... }: with all; ([
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchsvn, darwin, libtiff
|
||||
, libpng, zlib, libwebp, libraw, openexr, openjpeg
|
||||
, libjpeg, jxrlib, pkg-config }:
|
||||
, libjpeg, jxrlib, pkg-config
|
||||
, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "freeimage";
|
||||
|
|
@ -17,7 +18,12 @@ stdenv.mkDerivation {
|
|||
prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib";
|
||||
patches = [ ./unbundle.diff ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools;
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.cctools
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
|
||||
|
||||
postBuild = lib.optionalString (!stdenv.isDarwin) ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jxrlib";
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
--replace '.so' '.dylib'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, enableXen ? false, xen ? null
|
||||
, enableIscsi ? false, openiscsi
|
||||
, enableCeph ? false, ceph
|
||||
, enableGlusterfs ? false, glusterfs
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -72,6 +73,8 @@ in stdenv.mkDerivation rec {
|
|||
openiscsi
|
||||
] ++ optionals enableCeph [
|
||||
ceph
|
||||
] ++ optionals enableGlusterfs [
|
||||
glusterfs
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv gmp
|
||||
];
|
||||
|
|
@ -119,6 +122,7 @@ in stdenv.mkDerivation rec {
|
|||
"-Dsecdriver_apparmor=enabled"
|
||||
"-Dnumad=enabled"
|
||||
"-Dstorage_disk=enabled"
|
||||
(opt "glusterfs" enableGlusterfs)
|
||||
(opt "storage_rbd" enableCeph)
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-Dinit_script=none"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, fetchFromGitHub
|
||||
, zlib
|
||||
, ilmbase
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
, numactl, rdma-core, libbfd, libiberty, perl, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "ucx-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ucx";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openucx";
|
||||
repo = "ucx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1";
|
||||
sha256 = "1j2gfw4anixb5ajgiyn7bcca8pgjvsaf0y0b2xz88s9hdx0h6gs9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen ];
|
||||
|
|
|
|||
28
pkgs/development/php-packages/deployer/default.nix
Normal file
28
pkgs/development/php-packages/deployer/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "deployer";
|
||||
version = "6.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://deployer.org/releases/v${version}/${pname}.phar";
|
||||
sha256 = "09mxwfa7yszsiljbkxpsd4sghqngl08cn18v4g1fbsxp3ib3kxi5";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/deployer/deployer.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A deployment tool for PHP";
|
||||
license = licenses.mit;
|
||||
homepage = "https://deployer.org/";
|
||||
maintainers = with maintainers; teams.php.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -42,6 +42,11 @@ buildPythonPackage rec {
|
|||
pytest-httpx
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# fails with pytest-httpx>=0.12.0
|
||||
"test__query_rmv_api_fail"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cgtobi/PyRMVtransport";
|
||||
description = "Get transport information from opendata.rmv.de";
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobotocore";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43";
|
||||
sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1";
|
||||
};
|
||||
|
||||
# relax version constraints: aiobotocore works with newer botocore versions
|
||||
# the pinning used to match some `extras_require` we're not using.
|
||||
preConfigure = ''
|
||||
substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore'
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ];
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "aiobotocore" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Async client for amazon services using botocore and aiohttp/asyncio.";
|
||||
description = "Python client for amazon services";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/aio-libs/aiobotocore";
|
||||
maintainers = with maintainers; [ teh ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,35 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, dateutil, mock, isPy3k }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dateutil
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aniso8601";
|
||||
version = "9.0.1";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parses ISO 8601 strings.";
|
||||
homepage = "https://bitbucket.org/nielsenb/aniso8601";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dateutil ];
|
||||
|
||||
checkInputs = lib.optional (!isPy3k) mock;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973";
|
||||
sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dateutil
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
] ++ lib.optional (!isPy3k) mock;
|
||||
|
||||
pythonImportsCheck = [ "aniso8601" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Parser for ISO 8601 strings";
|
||||
homepage = "https://bitbucket.org/nielsenb/aniso8601";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,25 +3,42 @@
|
|||
, fetchPypi
|
||||
, numpy
|
||||
, astropy
|
||||
, astropy-helpers
|
||||
, astropy-extension-helpers
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pytest-doctestplus
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astropy-healpix";
|
||||
version = "0.6";
|
||||
|
||||
doCheck = false; # tests require pytest-astropy
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit version;
|
||||
pname = lib.replaceStrings ["-"] ["_"] pname;
|
||||
sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy astropy astropy-helpers ];
|
||||
nativeBuildInputs = [
|
||||
astropy-extension-helpers
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
# Disable automatic update of the astropy-helper module
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
astropy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-doctestplus
|
||||
hypothesis
|
||||
];
|
||||
|
||||
# tests must be run in the build directory
|
||||
preCheck = ''
|
||||
cd build/lib*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "breezy";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be";
|
||||
sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq";
|
||||
hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -33,6 +33,7 @@ buildPythonPackage rec {
|
|||
inherit gdb;
|
||||
})
|
||||
|
||||
# Use nixpkgs version instead of versioneer
|
||||
(substituteAll {
|
||||
src = ./hardcode-version.patch;
|
||||
inherit version;
|
||||
|
|
@ -87,6 +88,8 @@ buildPythonPackage rec {
|
|||
"gevent"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "debugpy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of the Debug Adapter Protocol for Python";
|
||||
homepage = "https://github.com/microsoft/debugpy";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/tests/debug/session.py b/tests/debug/session.py
|
||||
index 2b39106..6d45a10 100644
|
||||
index 101492f..4ee7cfb 100644
|
||||
--- a/tests/debug/session.py
|
||||
+++ b/tests/debug/session.py
|
||||
@@ -625,6 +625,7 @@ class Session(object):
|
||||
@@ -630,6 +630,7 @@ class Session(object):
|
||||
if "PYTHONPATH" in self.config.env:
|
||||
# If specified, launcher will use it in lieu of PYTHONPATH it inherited
|
||||
# from the adapter when spawning debuggee, so we need to adjust again.
|
||||
|
|
|
|||
|
|
@ -5,25 +5,23 @@
|
|||
, libopus
|
||||
, pynacl
|
||||
, pythonOlder
|
||||
, websockets
|
||||
, withVoice ? true
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rapptz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo=";
|
||||
sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
websockets
|
||||
] ++ lib.optionalString withVoice [
|
||||
libopus
|
||||
pynacl
|
||||
|
|
|
|||
|
|
@ -4,12 +4,15 @@
|
|||
, httpx
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytest-httpx
|
||||
, pytestCheckHook
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elmax";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -17,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-elmax";
|
||||
rev = version;
|
||||
sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY=";
|
||||
sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
|
@ -27,8 +30,12 @@ buildPythonPackage rec {
|
|||
yarl
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-httpx
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "elmax" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, python
|
||||
, scikitimage
|
||||
, openjpeg
|
||||
, procps
|
||||
, pytestCheckHook
|
||||
, contextlib2
|
||||
, mock
|
||||
, importlib-resources
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "glymur";
|
||||
version = "0.8.18";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quintusdias";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7";
|
||||
sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,16 +30,21 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
scikitimage
|
||||
procps
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace glymur/config.py \
|
||||
--replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}"
|
||||
--replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
disabledTestPaths = [
|
||||
# this test involves glymur's different ways of finding the openjpeg path on
|
||||
# fsh systems by reading an .rc file and such, and is obviated by the patch
|
||||
# in postConfigure
|
||||
"tests/test_config.py"
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for accessing JPEG2000 files";
|
||||
|
|
|
|||
|
|
@ -5,24 +5,25 @@
|
|||
, h11
|
||||
, h2
|
||||
, pproxy
|
||||
, pytest-asyncio
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, sniffio
|
||||
, uvicorn
|
||||
, trustme
|
||||
, trio
|
||||
, uvicorn
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "httpcore";
|
||||
version = "0.12.3";
|
||||
version = "0.13.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109";
|
||||
sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,18 +34,19 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pproxy
|
||||
pytest-asyncio
|
||||
pytest-trio
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
uvicorn
|
||||
trustme
|
||||
trio
|
||||
uvicorn
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
disabledTestPaths = [
|
||||
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
|
||||
"--ignore=tests/test_threadsafety.py"
|
||||
"--ignore=tests/sync_tests/test_interfaces.py"
|
||||
"--ignore=tests/sync_tests/test_retries.py"
|
||||
"tests/test_threadsafety.py"
|
||||
"tests/sync_tests/test_interfaces.py"
|
||||
"tests/sync_tests/test_retries.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "httpcore" ];
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "httpx";
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U=";
|
||||
sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykmtronic";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5";
|
||||
sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp lxml ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
, isPy27
|
||||
, six
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, numpy
|
||||
, setuptools_scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -17,7 +19,12 @@ buildPythonPackage rec {
|
|||
sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
nativeBuildInputs = [
|
||||
setuptools_scm
|
||||
];
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
|
|
@ -25,14 +32,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# check_distribution incorrectly pulls pytest version
|
||||
checkPhase = ''
|
||||
pytest -k 'not check_distribution'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin with advanced doctest features";
|
||||
homepage = "https://astropy.org";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-httpx";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Colin-b";
|
||||
repo = "pytest_httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi";
|
||||
sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4=";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, astropy
|
||||
, pytest
|
||||
, pytest-astropy
|
||||
, astropy-helpers
|
||||
, pytestCheckHook
|
||||
, pytest-doctestplus
|
||||
, scipy
|
||||
}:
|
||||
|
||||
|
|
@ -13,25 +12,18 @@ buildPythonPackage rec {
|
|||
version = "0.3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit version;
|
||||
pname = "radio-beam";
|
||||
sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ astropy ];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
|
||||
# Disable automatic update of the astropy-helper module
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest pytest-astropy scipy ];
|
||||
checkInputs = [ pytestCheckHook pytest-doctestplus scipy ];
|
||||
|
||||
# Tests must be run in the build directory
|
||||
checkPhase = ''
|
||||
preCheck = ''
|
||||
cd build/lib
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "respx";
|
||||
version = "0.16.3";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lundberg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd";
|
||||
sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4=";
|
||||
};
|
||||
|
||||
# Coverage is under 100 % due to the excluded tests
|
||||
|
|
|
|||
|
|
@ -20,6 +20,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'httpx>=0.16, <0.18' 'httpx' \
|
||||
--replace 'httpcore==0.12.*' 'httpcore'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ httpx sanic websockets httpcore ];
|
||||
|
||||
# `sanic` is explicitly set to null when building `sanic` itself
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, aplpy
|
||||
, joblib
|
||||
, astropy
|
||||
, radio_beam
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytest-astropy
|
||||
, astropy-helpers
|
||||
}:
|
||||
|
|
@ -20,13 +21,18 @@ buildPythonPackage rec {
|
|||
sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatibility with radio_beam >= 0.3.3. Will be included
|
||||
# in the next release of spectral cube > 0.5.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/radio-astro-tools/spectral-cube/commit/bbe4295ebef7dfa6fe4474275a29acd6cb0cb544.patch";
|
||||
sha256 = "1qddfm3364kc34yf6wd9nd6rxh4qc2v5pqilvz9adwb4a50z28bf";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
propagatedBuildInputs = [ astropy radio_beam joblib ];
|
||||
checkInputs = [ aplpy pytest pytest-astropy ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest spectral_cube
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook aplpy pytest-astropy ];
|
||||
|
||||
meta = {
|
||||
description = "Library for reading and analyzing astrophysical spectral data cubes";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, beautifulsoup4
|
||||
, drms
|
||||
, glymur
|
||||
, h5netcdf
|
||||
, hypothesis
|
||||
, matplotlib
|
||||
, numpy
|
||||
|
|
@ -50,6 +51,7 @@ buildPythonPackage rec {
|
|||
pandas
|
||||
astropy
|
||||
astropy-helpers
|
||||
h5netcdf
|
||||
parfive
|
||||
sqlalchemy
|
||||
scikitimage
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.14.3";
|
||||
version = "3.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg=";
|
||||
sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "1.16.1";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0=";
|
||||
sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc=";
|
||||
};
|
||||
vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y=";
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }:
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-watch";
|
||||
version = "7.6.1";
|
||||
version = "7.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "passcod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80=";
|
||||
sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k=";
|
||||
cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin CoreServices;
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
|
||||
|
||||
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
|
||||
# (calling cargo-watch with command `cargo watch`)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sqlx-cli";
|
||||
|
|
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
|
||||
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
mktplcRef = {
|
||||
name = "terraform";
|
||||
publisher = "hashicorp";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
|
||||
vsix = fetchurl {
|
||||
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
|
||||
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
|
||||
sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq";
|
||||
sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz";
|
||||
};
|
||||
|
||||
patches = [ ./fix-terraform-ls.patch ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.11.16";
|
||||
version = "5.11.18";
|
||||
suffix = "lqx1";
|
||||
in
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ buildLinux (args // {
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b";
|
||||
sha256 = "0fz0s6bdcvbzy1149acqkq3aqg481dwiq85wh7ii1hx6p1gbsx71";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxc";
|
||||
version = "4.0.8";
|
||||
version = "4.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
|
||||
sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc";
|
||||
sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
{ lib, stdenv, fetchurl
|
||||
# native deps.
|
||||
, runCommand, pkg-config, meson, ninja, makeWrapper
|
||||
# build+runtime deps.
|
||||
|
|
@ -17,11 +17,11 @@ lua = luajitPackages;
|
|||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "knot-resolver";
|
||||
version = "5.3.1";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
|
||||
sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9";
|
||||
sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wireguard-exporter";
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MindFlavor";
|
||||
repo = "prometheus_wireguard_exporter";
|
||||
rev = version;
|
||||
sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY=";
|
||||
sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M=";
|
||||
cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.46.0";
|
||||
version = "0.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI=";
|
||||
sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk=";
|
||||
vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2021.03.30";
|
||||
version = "2021.04.26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc=";
|
||||
sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "agi";
|
||||
version = "1.1.0-dev-20210430";
|
||||
version = "1.1.0-dev-20210504";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
|
||||
sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk=";
|
||||
sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A program that compares two images using a perceptually based image metric";
|
||||
homepage = "https://github.com/myint/perceptualdiff";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ uri-canva ];
|
||||
platforms = platforms.x86;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,12 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "burpsuite";
|
||||
version = "2020.12.1";
|
||||
version = "2021.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
|
||||
sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0=";
|
||||
urls = [
|
||||
"https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.37.2";
|
||||
version = "0.37.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI=";
|
||||
sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "DisnixWebService-0.10";
|
||||
name = "DisnixWebService-0.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz";
|
||||
sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
|
||||
url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz";
|
||||
sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr";
|
||||
};
|
||||
buildInputs = [ apacheAnt jdk ];
|
||||
PREFIX = "\${env.out}";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnix-0.10";
|
||||
name = "disnix-0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz";
|
||||
sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg";
|
||||
url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz";
|
||||
sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ];
|
||||
buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ];
|
||||
|
||||
meta = {
|
||||
description = "A Nix-based distributed service deployment tool";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "disnixos-0.9";
|
||||
name = "disnixos-0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz";
|
||||
sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7";
|
||||
url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz";
|
||||
sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version="2020-07-04";
|
||||
version="2020-11-02";
|
||||
name = "dydisnix-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "dydisnix";
|
||||
rev = "e99091f1c2329d562097e35faedee80622d387f0";
|
||||
sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0=";
|
||||
rev = "12ca1516bc1e5d161ac68f5d8252a0a2f353c8cf";
|
||||
sha256 = "00f341274hwwil8mlgcgq331vfca9sscvpdbgkxsjvbhcqd8qa52";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake libtool ];
|
||||
buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ];
|
||||
buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ];
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, netcat
|
||||
, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
|
||||
, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null, nginx ? null, s6-rc ? null, xinetd ? null
|
||||
, enableApacheWebApplication ? false
|
||||
, enableAxis2WebService ? false
|
||||
, enableEjabberdDump ? false
|
||||
|
|
@ -10,7 +10,10 @@
|
|||
, enableMongoDatabase ? false
|
||||
, enableInfluxDatabase ? false
|
||||
, enableSupervisordProgram ? false
|
||||
, enableDockerContainer ? true
|
||||
, enableDockerContainer ? false
|
||||
, enableNginxWebApplication ? false
|
||||
, enableXinetdService ? false
|
||||
, enableS6RCService ? false
|
||||
, enableLegacy ? false
|
||||
, catalinaBaseDir ? "/var/tomcat"
|
||||
, jobTemplate ? "systemd"
|
||||
|
|
@ -25,16 +28,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
|
|||
assert enableInfluxDatabase -> influxdb != null;
|
||||
assert enableSupervisordProgram -> supervisor != null;
|
||||
assert enableDockerContainer -> docker != null;
|
||||
assert enableNginxWebApplication -> nginx != null;
|
||||
assert enableS6RCService -> s6-rc != null;
|
||||
assert enableXinetdService -> xinetd != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dysnomia-0.10";
|
||||
name = "dysnomia-0.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz";
|
||||
sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna";
|
||||
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz";
|
||||
sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3";
|
||||
};
|
||||
|
||||
preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
|
||||
|
||||
configureFlags = [
|
||||
(if enableApacheWebApplication then "--with-apache" else "--without-apache")
|
||||
(if enableAxis2WebService then "--with-axis2" else "--without-axis2")
|
||||
|
|
@ -47,6 +51,10 @@ stdenv.mkDerivation {
|
|||
(if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
|
||||
(if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
|
||||
(if enableDockerContainer then "--with-docker" else "--without-docker")
|
||||
(if enableNginxWebApplication then "--with-nginx" else "--without-nginx")
|
||||
(if enableXinetdService then "--with-xinetd" else "--without-xinetd")
|
||||
(if enableS6RCService then "--with-s6-rc" else "--without-s6-rc")
|
||||
(if stdenv.isDarwin then "--with-launchd" else "--without-launchd")
|
||||
"--with-job-template=${jobTemplate}"
|
||||
] ++ lib.optional enableLegacy "--enable-legacy";
|
||||
|
||||
|
|
@ -56,11 +64,13 @@ stdenv.mkDerivation {
|
|||
++ lib.optional enableMySQLDatabase mysql.out
|
||||
++ lib.optional enablePostgreSQLDatabase postgresql
|
||||
++ lib.optional enableSubversionRepository subversion
|
||||
++ lib.optional enableMongoDatabase mongodb
|
||||
++ lib.optional enableMongoDatabase mongodb-tools
|
||||
++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ]
|
||||
++ lib.optional enableInfluxDatabase influxdb
|
||||
++ lib.optional enableSupervisordProgram supervisor
|
||||
++ lib.optional enableDockerContainer docker;
|
||||
++ lib.optional enableDockerContainer docker
|
||||
++ lib.optional enableNginxWebApplication nginx
|
||||
++ lib.optional enableS6RCService s6-rc
|
||||
++ lib.optional enableXinetdService xinetd;
|
||||
|
||||
meta = {
|
||||
description = "Automated deployment of mutable components and services for Disnix";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kbs2";
|
||||
version = "0.2.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodruffw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0=";
|
||||
sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo=";
|
||||
cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optionals stdenv.isLinux [ python3 ];
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit libiconv ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
|
|
|
|||
|
|
@ -20801,7 +20801,7 @@ in
|
|||
prototool = callPackage ../development/tools/prototool { };
|
||||
|
||||
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
|
||||
qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; });
|
||||
qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; });
|
||||
|
||||
# See `xenPackages` source for explanations.
|
||||
# Building with `xen` instead of `xen-slim` is possible, but makes no sense.
|
||||
|
|
@ -27568,7 +27568,7 @@ in
|
|||
|
||||
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
|
||||
|
||||
openethereum = callPackage ../applications/blockchains/openethereum { };
|
||||
openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; };
|
||||
|
||||
parity-ui = callPackage ../applications/blockchains/parity-ui { };
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
composer1 = callPackage ../development/php-packages/composer/1.x.nix { };
|
||||
|
||||
deployer = callPackage ../development/php-packages/deployer { };
|
||||
|
||||
php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
|
||||
|
||||
php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue