diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index cb30b2e0138..1318ac2a586 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -110,7 +110,6 @@ with lib.maintainers; {
members = [
mmilata
petabyteboy
- prusnak
ryantm
];
scope = "Maintain Jitsi.";
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index c75adb11ed4..10d1bb9ca65 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -3,7 +3,7 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver
-, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
+, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:
mkDerivation rec {
@@ -23,7 +23,7 @@ mkDerivation rec {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver
- curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
+ curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
pcre snappy taglib taglib_extras
];
diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix
index 3044acb3264..96053d08d00 100644
--- a/pkgs/applications/audio/r128gain/default.nix
+++ b/pkgs/applications/audio/r128gain/default.nix
@@ -3,7 +3,7 @@
, genericUpdater
, substituteAll
, common-updater-scripts
-, ffmpeg_3
+, ffmpeg
, python3Packages
, sox
}:
@@ -20,12 +20,10 @@ python3Packages.buildPythonApplication rec {
};
patches = [
- (
- substituteAll {
- src = ./ffmpeg-location.patch;
- ffmpeg = ffmpeg_3;
- }
- )
+ (substituteAll {
+ src = ./ffmpeg-location.patch;
+ inherit ffmpeg;
+ })
];
propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ];
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index 4adfe0f6526..de145efd444 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -9,23 +9,25 @@
, qtbase
, qtdeclarative
, qtmultimedia
+, qtsvg
+, qttools
}:
mkDerivation rec {
pname = "mediaelch";
- version = "2.8.6";
+ version = "2.8.8";
src = fetchFromGitHub {
owner = "Komet";
repo = "MediaElch";
rev = "v${version}";
- sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43";
+ sha256 = "0yif0ibmlj0bhl7fnhg9yclxg2iyjygmjhffinp5kgqy0vaabkzw";
fetchSubmodules = true;
};
- nativeBuildInputs = [ qmake ];
+ nativeBuildInputs = [ qmake qttools ];
- buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia ];
+ buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ];
prePatch = ''
substituteInPlace MediaElch.pro --replace "/usr" "$out"
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 3f3eec49c94..c906a0db4fd 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -29,7 +29,7 @@
# Media support (implies audio support)
, mediaSupport ? true
-, ffmpeg_3
+, ffmpeg
, gmp
@@ -81,7 +81,7 @@ let
]
++ optionals pulseaudioSupport [ libpulseaudio ]
++ optionals mediaSupport [
- ffmpeg_3
+ ffmpeg
];
# Library search path for the fte transport
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index fdf9e97e7c9..d0ffb22217f 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "sha256-co/0ogI48FxrwVGwIuMqeFPFYtQF4/rv9V6b225TZc4=";
+ sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw=";
};
vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88=";
diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix
index 76bd115a9b1..a466598f00d 100644
--- a/pkgs/applications/networking/cluster/kube-score/default.nix
+++ b/pkgs/applications/networking/cluster/kube-score/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-score";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "zegl";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TYsuSPWTiIlPscul/QO59+lt6sbjJdt7pJuJYO5R9Tc=";
+ sha256 = "sha256-O0RtlFkyo01kcxWSzrkhh7vvV76B7I5V19dSzaxvv4Y=";
};
- vendorSha256 = "sha256-ob7mNheyeTcDWml4gi1SD3Pq+oWtJeySIUg2ZrCj0y0=";
+ vendorSha256 = "sha256-qFS+N0tOf3zxqs1tN6Z1EnR3qLR1FfZNfJ21NoRXek0=";
meta = with lib; {
description = "Kubernetes object analysis with recommendations for improved reliability and security";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index be331156eed..f1064d350e0 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -165,9 +165,9 @@ in rec {
});
terraform_0_15 = pluggable (generic {
- version = "0.15.0";
- sha256 = "0d7hai57x6qczacdnzzvs3766180n6grmq0a7rlw5jp3zgzp8bmr";
- vendorSha256 = "1l67kkrk8jw7v1rqpwj6n0l7lvmfgf1ir430j1n96459s1dzf0cn";
+ version = "0.15.1";
+ sha256 = "02bqg05wsqld9xybvg7swvmympq5bggkw8vcq91z6vkpawm8z3kg";
+ vendorSha256 = "1lnz6b2kjilidvs4flx9vj5j6dxliqdxni96fn2537nqaz4hc7l2";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 0d726e5cfc5..f643ae1e673 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}";
description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices";
license = licenses.mit;
- maintainers = with maintainers; [ peterhoeg jk ];
+ maintainers = with maintainers; [ jk ];
};
}
diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix
index beb957786ba..aa5d14724ac 100644
--- a/pkgs/applications/networking/openbazaar/default.nix
+++ b/pkgs/applications/networking/openbazaar/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "openbazaar";
- version = "0.14.3";
+ version = "0.14.6";
suffix = {
i686-linux = "linux-386";
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}";
sha256 = {
- i686-linux = "098dgxpz9m4rfswc9yg77s3bvaifd4453s20n8kmh55g5ipgs2x1";
- x86_64-darwin = "0q989m4zj7x9d6vimmpfkla78hmx2zr7bxm9yg61ir00w60l14jx";
- x86_64-linux = "093rwn4nfirknbxz58n16v0l0apj2h0yr63f64fqysmy78883al2";
+ i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq";
+ x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx";
+ x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
diff --git a/pkgs/applications/virtualization/ignite/default.nix b/pkgs/applications/virtualization/ignite/default.nix
new file mode 100644
index 00000000000..5439ad57b1a
--- /dev/null
+++ b/pkgs/applications/virtualization/ignite/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, cni-plugins
+, buildGoModule
+, firecracker
+, containerd
+, runc
+, makeWrapper
+, fetchFromGitHub
+, git
+}:
+
+buildGoModule rec{
+ pname = "ignite";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "weaveworks";
+ repo = "ignite";
+ rev = "v${version}";
+ sha256 = "sha256-rjCsZ12DHcSw5GZu6jGTtqCPOZDSbYoMplkqvspbvO8=";
+ leaveDotGit = true;
+ };
+
+ vendorSha256 = null;
+
+ doCheck = false;
+
+ postPatch = ''
+ # ignite tries to run cni-plugins programs from /opt/cni/bin
+ substituteInPlace pkg/constants/dependencies.go \
+ --replace "/opt/cni/bin/loopback" ${cni-plugins}/bin/loopback \
+ --replace "/opt/cni/bin/bridge" ${cni-plugins}/bin/bridge
+
+ # ignite tries to run cni-plugins programs from /opt/cni/bin
+ substituteInPlace pkg/network/cni/cni.go \
+ --replace "/opt/cni/bin" ${cni-plugins}/bin
+
+ # fetchgit doesn't fetch tags from git repository so it's necessary to force IGNITE_GIT_VERSION to be ${version}
+ # also forcing git state to be clean because if it's dirty ignite will try to fetch the image weaveworks/ignite:dev
+ # which is not in docker.io, we want it to fetch the image weaveworks/ignite:v${version}
+ substituteInPlace hack/ldflags.sh \
+ --replace '$(git describe --tags --abbrev=14 "''${IGNITE_GIT_COMMIT}^{commit}" 2>/dev/null)' "v${version}" \
+ --replace 'IGNITE_GIT_TREE_STATE="dirty"' 'IGNITE_GIT_TREE_STATE="clean"'
+ '';
+
+ nativeBuildInputs = [
+ git
+ makeWrapper
+ ];
+
+ buildInputs = [
+ firecracker
+ ];
+
+ preBuild = ''
+ patchShebangs ./hack/ldflags.sh
+ export buildFlagsArray+=("-ldflags=$(./hack/ldflags.sh)")
+ '';
+
+ postInstall = ''
+ for prog in hack ignite ignited ignite-spawn; do
+ wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ cni-plugins firecracker containerd runc ]}
+ done
+ '';
+
+ meta = with lib; {
+ description = "Ignite a Firecracker microVM";
+ homepage = "https://github.com/weaveworks/ignite";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ tfmoraes ];
+ };
+}
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index c9e5a097de1..d5277899892 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -2,7 +2,7 @@
let
ocamlDependencies = version:
- if lib.versionAtLeast version "4.0"
+ if lib.versionAtLeast version "4.2"
then with ocaml-ng.ocamlPackages; [
ocaml
findlib
@@ -13,8 +13,19 @@ let
sha
dune_2
luv
- (if lib.versionAtLeast version "4.2"
- then ocaml_extlib else ocaml_extlib-1-7-7)
+ ocaml_extlib
+ ] else if lib.versionAtLeast version "4.0"
+ then with ocaml-ng.ocamlPackages_4_10; [
+ ocaml
+ findlib
+ sedlex_2
+ xml-light
+ ptmap
+ camlp5
+ sha
+ dune_2
+ luv
+ ocaml_extlib-1-7-7
] else with ocaml-ng.ocamlPackages_4_05; [
ocaml
camlp4
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index c4bee741d2a..7c16dcf4650 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -1,14 +1,33 @@
-{
- mkDerivation,
- extra-cmake-modules,
- attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, attr
+, ebook_tools
+, exiv2
+, ffmpeg
+, karchive
+, kcoreaddons
+, ki18n
+, poppler
+, qtbase
+, qtmultimedia
+, taglib
}:
mkDerivation {
name = "kfilemetadata";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
- attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia
+ attr
+ ebook_tools
+ exiv2
+ ffmpeg
+ karchive
+ kcoreaddons
+ ki18n
+ poppler
+ qtbase
+ qtmultimedia
taglib
];
patches = [
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 0f56f8c97f3..47f6ffe2c52 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ]
++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
- patches = [ ./libguestfs-syms.patch ];
+ patches = [ ./libguestfs-syms.patch ./ocaml-4.12.patch ];
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
installFlags = [ "REALLY_INSTALL=yes" ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libguestfs/ocaml-4.12.patch b/pkgs/development/libraries/libguestfs/ocaml-4.12.patch
new file mode 100644
index 00000000000..032527d5713
--- /dev/null
+++ b/pkgs/development/libraries/libguestfs/ocaml-4.12.patch
@@ -0,0 +1,11 @@
+--- a/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100
++++ b/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100
+@@ -305,7 +305,7 @@
+ | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
+ | _ -> invalid_arg "combine3"
+
+- let rec assoc_lbl ?(cmp = compare) ~default x = function
++ let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
+ | [] -> default
+ | (y, y') :: _ when cmp x y = 0 -> y'
+ | _ :: ys -> assoc_lbl ~cmp ~default x ys
diff --git a/pkgs/development/ocaml-modules/extlib/1.7.7.nix b/pkgs/development/ocaml-modules/extlib/1.7.7.nix
index 3314ebcb9b5..d27fe085569 100644
--- a/pkgs/development/ocaml-modules/extlib/1.7.7.nix
+++ b/pkgs/development/ocaml-modules/extlib/1.7.7.nix
@@ -1,11 +1,14 @@
# Older version of extlib for Haxe 4.0 and 4.1.
# May be replaceable by the next extlib + extlib-base64 release.
-{ fetchurl, ocaml_extlib }:
+{ lib, fetchurl, ocaml, ocaml_extlib }:
-ocaml_extlib.overrideAttrs (_: rec {
+ocaml_extlib.overrideAttrs (x: rec {
version = "1.7.7";
src = fetchurl {
url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";
sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1";
};
+ meta = x.meta // {
+ broken = lib.versionAtLeast ocaml.version "4.12";
+ };
})
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix
index eb429b2bb6d..e348c5d9325 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -1,4 +1,5 @@
{ self
+, lib
, openssl
, zstd
}:
@@ -40,6 +41,7 @@ with self;
version = "0.14.1";
hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2";
meta.description = "Accessors for Core types, for use with the Accessor library";
+ meta.broken = lib.versionAtLeast ocaml.version "4.12";
propagatedBuildInputs = [ accessor_base core_kernel ];
};
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 2345f8cae46..5d0ee6f7c42 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.6.0";
+ version = "3.8.0";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-096bMTAh5d2wikrmlDcUspD9GYZlPHbdDcf/e/BLAHI=";
+ sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix
index 59eb468868a..d782de26ab7 100644
--- a/pkgs/development/python-modules/adb-enhanced/default.nix
+++ b/pkgs/development/python-modules/adb-enhanced/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "adb-enhanced";
- version = "2.5.10";
+ version = "2.5.11";
disabled = pythonOlder "3.4";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "ashishb";
repo = pname;
rev = version;
- sha256 = "sha256-JMbcOk9Yr4WbfVUMKe5zZZWvvjKwhpPMdBt9d7xE6ek=";
+ sha256 = "sha256-jb5O7Qxk2xAX5sax6nqywcGBJao5Xfff9s1yvdfvDCs=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index e404edddbcf..8388cd33e08 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, fetchPypi
, buildPythonPackage
, isPy27
@@ -63,6 +64,9 @@ buildPythonPackage rec {
"test_role_handler_positive"
];
+ # fails to run tests due to issues with temporary directory
+ doCheck = !stdenv.isDarwin;
+
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix
index 1854bd4f71b..94f6e3df8f2 100644
--- a/pkgs/development/python-modules/bip_utils/default.nix
+++ b/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bip_utils";
- version = "1.7.0";
+ version = "1.9.0";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = pname;
rev = "v${version}";
- sha256 = "1dj0c9sj0c4dkdf7rbz3s1z5kfzw22hpncm4bnwqigjzi6nrk81z";
+ sha256 = "0i1jdpdsrc8cal5x0b1am9mgbca69ymxlaqpkw0y4d0m3m6vs33k";
};
propagatedBuildInputs = [ ecdsa pysha3 ];
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 13c03a1f796..1c6d37681a6 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -72,7 +72,10 @@ buildPythonPackage rec {
--replace "cmdclass=versioneer.get_cmdclass()," ""
'';
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
+ pytestFlagsArray = [
+ "-n $NIX_BUILD_CORES"
+ "-m 'not network'"
+ ];
disabledTests = [
"test_annotation_pack_unpack"
@@ -82,6 +85,8 @@ buildPythonPackage rec {
"test_auto_blocksize_csv"
];
+ __darwinAllowLocalNetworking = true;
+
pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix
index 51b0060cb2d..f845ca6a5d3 100644
--- a/pkgs/development/python-modules/ffmpeg-python/default.nix
+++ b/pkgs/development/python-modules/ffmpeg-python/default.nix
@@ -2,9 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, substituteAll
-, ffmpeg_3
+, pytestCheckHook
+, ffmpeg
, future
-, pytest
, pytestrunner
, pytest-mock
}:
@@ -21,23 +21,20 @@ buildPythonPackage rec {
};
patches = [
- (
- substituteAll {
- src = ./ffmpeg-location.patch;
- ffmpeg = ffmpeg_3;
- }
- )
+ (substituteAll {
+ src = ./ffmpeg-location.patch;
+ inherit ffmpeg;
+ })
];
buildInputs = [ pytestrunner ];
propagatedBuildInputs = [ future ];
- checkInputs = [ pytest pytest-mock ];
+ checkInputs = [ pytestCheckHook pytest-mock ];
meta = with lib; {
description = "Python bindings for FFmpeg - with complex filtering support";
homepage = "https://github.com/kkroening/ffmpeg-python";
license = licenses.asl20;
maintainers = [ maintainers.AluisioASG ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix
index 43583416bb4..57168b1d915 100644
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -14,26 +14,32 @@
buildPythonPackage rec {
pname = "slither-analyzer";
- version = "0.7.0";
-
+ version = "0.7.1";
disabled = pythonOlder "3.6";
- # No Python tests
- doCheck = false;
-
src = fetchPypi {
inherit pname version;
- sha256 = "10r479xidgxvas4wb0z6injp59jrn7rfq8d7bxlcalc2dy4mawr0";
+ sha256 = "sha256-v/UuxxgMmkGfP962AfOQU05MI8xJocpD8SkENCZi04I=";
};
- nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = [ crytic-compile prettytable setuptools ];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ propagatedBuildInputs = [
+ crytic-compile
+ prettytable
+ setuptools
+ ];
postFixup = lib.optionalString withSolc ''
wrapProgram $out/bin/slither \
--prefix PATH : "${lib.makeBinPath [ solc ]}"
'';
+ # No Python tests
+ doCheck = false;
+
meta = with lib; {
description = "Static Analyzer for Solidity";
longDescription = ''
@@ -43,6 +49,6 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/trailofbits/slither";
license = licenses.agpl3Plus;
- maintainers = with maintainers; [ arturcygan ];
+ maintainers = with maintainers; [ arturcygan fab ];
};
}
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index b5b0c8b81bf..aa6382bb16d 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "kustomize";
- version = "4.0.5";
+ version = "4.1.2";
# rev is the commit of the tag, mainly for kustomize version command output
rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245";
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "kubernetes-sigs";
repo = pname;
rev = "kustomize/v${version}";
- sha256 = "sha256-rv65sDr6V6hEYgIRxS1OSu9txmW75F7/YGAy/zRXGyY=";
+ sha256 = "sha256-uomtW6PPs/UHvKRbHToot6kU4YJGLJuet8vJENbwEgI=";
};
# TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged.
@@ -26,7 +26,7 @@ buildGoModule rec {
# avoid finding test and development commands
sourceRoot = "source/kustomize";
- vendorSha256 = "sha256-lLUi0vD7uyfDR4HjDiosoTU0NbfQTY7ewZGm38ZT9nU=";
+ vendorSha256 = "sha256-fcsjxtCojahI6ZIcaSG5ubNqlWEC6DnNHtVYwTtbSw4=";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index 223ac39c6aa..eb38b60f9b1 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -25,8 +25,10 @@ let src =
}."${version}";
};
ocamlPackages =
- if lib.versionAtLeast version "0.14.3"
+ if lib.versionAtLeast version "0.17.0"
then ocaml-ng.ocamlPackages
+ else if lib.versionAtLeast version "0.14.3"
+ then ocaml-ng.ocamlPackages_4_10
else ocaml-ng.ocamlPackages_4_07
; in
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 655f7b4d4c2..a1d0b76eb1f 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }:
let
version = "1.99.21";
in
@@ -13,6 +13,14 @@ stdenv.mkDerivation {
sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
};
+ patches = [
+ # Fix compilation with OCaml 4.12
+ (fetchpatch {
+ url = "https://github.com/OCamlPro/ocp-build/commit/104e4656ca6dba9edb03b62539c9f1e10abcaae8.patch";
+ sha256 = "0sbyi4acig9q8x1ky4hckfg5pm2nad6zasi51ravaf1spgl148c2";
+ })
+ ];
+
buildInputs = [ ocaml findlib cmdliner re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index 84c335820ad..bb1f2316485 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wrangler";
- version = "1.16.0";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZOkoUMkpp89ON60xgz0ZzL9RAZeHstKTTl/UEc/y3Ls=";
+ sha256 = "sha256-chKmn38yB05NqDvtYWo4EwEIiD6kjy/1OMaMFM4qAA8=";
};
- cargoSha256 = "sha256-Cppj3sRJzH8UiyM8lXT2dWqsWr83EApYKqYq3nJQZi8=";
+ cargoSha256 = "sha256-pG3ZsRPa/7QRkUik6a987SlGrl3B0thnN3h62JyzdJo=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index e3d2698e830..e1b2597d4f4 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,40 +1,100 @@
-{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config
-, epoxy, libxslt, libunwind, makeWrapper, egl-wayland
+{ egl-wayland
+, epoxy
+, fetchurl
+, fontutil
+, lib
+, libGL
+, libGLU
+, libX11
+, libXau
+, libXaw
+, libXdmcp
+, libXext
+, libXfixes
+, libXfont2
+, libXmu
+, libXpm
+, libXrender
+, libXres
+, libXt
+, libdrm
+, libtirpc
+, libunwind
+, libxcb
+, libxkbfile
+, libxshmfence
+, mesa
+, meson
+, ninja
+, openssl
+, pkg-config
+, pixman
+, stdenv
+, wayland
+, wayland-protocols
+, xkbcomp
+, xkeyboard_config
+, xorgproto
+, xtrans
+, zlib
, defaultFontPath ? "" }:
-with lib;
+stdenv.mkDerivation rec {
-xorgserver.overrideAttrs (oldAttrs: {
-
- name = "xwayland-${xorgserver.version}";
- buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ];
- propagatedBuildInputs = oldAttrs.propagatedBuildInputs
- ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
- configureFlags = [
- "--disable-docs"
- "--disable-devel-docs"
- "--enable-xwayland"
- "--enable-xwayland-eglstream"
- "--disable-xorg"
- "--disable-xvfb"
- "--disable-xnest"
- "--disable-xquartz"
- "--disable-xwin"
- "--enable-glamor"
- "--with-default-font-path=${defaultFontPath}"
- "--with-xkb-bin-directory=${xkbcomp}/bin"
- "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb"
- "--with-xkb-output=$(out)/share/X11/xkb/compiled"
+ pname = "xwayland";
+ version = "21.1.1";
+ src = fetchurl {
+ url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
+ sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84=";
+ };
+ nativeBuildInputs = [ pkg-config meson ninja ];
+ buildInputs = [
+ egl-wayland
+ epoxy
+ fontutil
+ libGL
+ libGLU
+ libX11
+ libXau
+ libXaw
+ libXdmcp
+ libXext
+ libXfixes
+ libXfont2
+ libXmu
+ libXpm
+ libXrender
+ libXres
+ libXt
+ libdrm
+ libtirpc
+ libunwind
+ libxcb
+ libxkbfile
+ libxshmfence
+ mesa
+ openssl
+ pixman
+ wayland
+ wayland-protocols
+ xkbcomp
+ xorgproto
+ xtrans
+ zlib
+ ];
+ mesonFlags = [
+ "-Dxwayland-eglstream=true"
+ "-Ddefault-font-path=${defaultFontPath}"
+ "-Dxkb_bin_dir=${xkbcomp}/bin"
+ "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb"
+ "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled"
];
- postInstall = ''
- rm -fr $out/share/X11/xkb/compiled
- '';
-
- meta = {
+ meta = with lib; {
description = "An X server for interfacing X11 apps with the Wayland protocol";
homepage = "https://wayland.freedesktop.org/xserver.html";
license = licenses.mit;
+ maintainers = with maintainers; [ emantor ];
platforms = platforms.linux;
};
-})
+}
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index ee291ccdc03..98a73e1acd3 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne johntitor marsam ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
+ mainProgram = "nu";
};
passthru = {
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 818ad5ec645..68218592bbb 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }:
+{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg }:
python3Packages.buildPythonApplication rec {
pname = "yle-dl";
@@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec {
};
propagatedBuildInputs = with python3Packages; [
- attrs ConfigArgParse ffmpeg_3 future lxml requests
+ attrs ConfigArgParse ffmpeg future lxml requests
];
pythonPath = [ rtmpdump php wget ];
doCheck = false; # tests require network access
- checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ];
+ checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ];
meta = with lib; {
description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix
new file mode 100644
index 00000000000..6ad9fdd4770
--- /dev/null
+++ b/pkgs/tools/security/nbtscanner/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "nbtscanner";
+ version = "0.0.1";
+
+ src = fetchFromGitHub {
+ owner = "jonkgrimes";
+ repo = pname;
+ rev = version;
+ sha256 = "06507a8y41v42cmvjpzimyrzdp972w15fjpc6c6750n1wa2wdl6c";
+ };
+
+ cargoSha256 = "0cis54zmr2x0f4z664lmhk9dzx00hvds6jh3x417308sz7ak11gd";
+
+ buildInputs = lib.optional stdenv.isDarwin Security;
+
+ meta = with lib; {
+ description = "NetBIOS scanner written in Rust";
+ homepage = "https://github.com/jonkgrimes/nbtscanner";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index 5d6a74327d4..ec023dd72a3 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg_3
+{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg
, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract
}:
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
wrapProgram $out/bin/rga \
- --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 pandoc poppler_utils ripgrep imagemagick tesseract ]}"
+ --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}"
'';
# Use upstream's example data to run a couple of queries to ensure the dependencies
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e94824531fa..5e9a6e1a06a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2371,7 +2371,8 @@ in
duf = callPackage ../tools/misc/duf { };
- inherit (ocamlPackages) dune_1 dune_2 dune-release;
+ inherit (ocaml-ng.ocamlPackages_4_10) dune_1;
+ inherit (ocamlPackages) dune_2 dune-release;
duperemove = callPackage ../tools/filesystems/duperemove { };
@@ -5591,6 +5592,8 @@ in
irods
irods-icommands;
+ ignite = callPackage ../applications/virtualization/ignite { };
+
igmpproxy = callPackage ../tools/networking/igmpproxy { };
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
@@ -6180,6 +6183,10 @@ in
nbench = callPackage ../tools/misc/nbench { };
+ nbtscanner = callPackage ../tools/security/nbtscanner {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
ncrack = callPackage ../tools/security/ncrack { };
nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
@@ -23042,7 +23049,7 @@ in
gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
- inherit (ocamlPackages) google-drive-ocamlfuse;
+ inherit (ocaml-ng.ocamlPackages_4_10) google-drive-ocamlfuse;
googler = callPackage ../applications/misc/googler {
python = python3;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bb454153571..6ae5f43a63c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1284,7 +1284,7 @@ let
if lib.versionOlder "4.08" ocaml.version
then import ../development/ocaml-modules/janestreet/0.14.nix {
inherit self;
- inherit (pkgs) openssl zstd;
+ inherit (pkgs) lib openssl zstd;
}
else if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
@@ -1502,5 +1502,5 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_latest = ocamlPackages_4_12;
- ocamlPackages = ocamlPackages_4_10;
+ ocamlPackages = ocamlPackages_4_12;
}