Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
commit
5d91721366
@ -0,0 +1,38 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "temporal-cli";
|
||||
version = "1.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "tctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests
|
||||
(fetchpatch {
|
||||
name = "fix-tests.patch";
|
||||
url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch";
|
||||
sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = temporal-cli;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Temporal CLI";
|
||||
homepage = "https://temporal.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
mainProgram = "tctl";
|
||||
};
|
||||
}
|
@ -176,6 +176,15 @@ self: super: {
|
||||
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector);
|
||||
|
||||
inline-c-cpp = overrideCabal (drv: {
|
||||
patches = drv.patches or [] ++ [
|
||||
(fetchpatch {
|
||||
# awaiting release >0.5.0.0
|
||||
url = "https://github.com/fpco/inline-c/commit/e176b8e8c3c94e7d8289a8b7cc4ce8e737741730.patch";
|
||||
name = "inline-c-cpp-pr-132-1.patch";
|
||||
sha256 = "sha256-CdZXAT3Ar4KKDGyAUu8A7hzddKe5/AuMKoZSjt3o0UE=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
|
||||
'';
|
||||
|
@ -25,7 +25,7 @@ self: super:
|
||||
# GHCJS does not ship with the same core packages as GHC.
|
||||
# https://github.com/ghcjs/ghcjs/issues/676
|
||||
stm = doJailbreak self.stm_2_5_0_2;
|
||||
exceptions = dontCheck self.exceptions_0_10_4;
|
||||
exceptions = dontCheck self.exceptions_0_10_5;
|
||||
|
||||
## OTHER PACKAGES
|
||||
|
||||
|
@ -6,7 +6,9 @@
|
||||
, libxkbcommon
|
||||
, libGL
|
||||
, ninja
|
||||
, libX11 }:
|
||||
, libX11
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwpe";
|
||||
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
description = "General-purpose library for WPE WebKit";
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://wpewebkit.org";
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]);
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -10,7 +10,9 @@
|
||||
, libwpe
|
||||
, libxkbcommon
|
||||
, libGL
|
||||
, libX11 }:
|
||||
, libX11
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wpebackend-fdo";
|
||||
@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Freedesktop.org backend for WPE WebKit";
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://wpewebkit.org";
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]);
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -19,6 +19,8 @@
|
||||
, gtk3
|
||||
, wayland
|
||||
, libwebp
|
||||
, libwpe
|
||||
, libwpe-fdo
|
||||
, enchant2
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
@ -65,7 +67,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.36.1";
|
||||
version = "2.36.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -73,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-AUnqX7HSDyqZgWd9RclSoEczAAHqJKjcKQNSOfEsDI8=";
|
||||
sha256 = "/pO920oCwONvkm77boHSiv0oi4gk9sXPanXPQCKOAI4=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
@ -82,7 +84,15 @@ stdenv.mkDerivation rec {
|
||||
inherit (builtins) storeDir;
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
|
||||
./libglvnd-headers.patch
|
||||
|
||||
# Hardcode path to WPE backend
|
||||
# https://github.com/NixOS/nixpkgs/issues/110468
|
||||
(substituteAll {
|
||||
src = ./fdo-backend-path.patch;
|
||||
wpebackend_fdo = libwpe-fdo;
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
@ -160,6 +170,8 @@ stdenv.mkDerivation rec {
|
||||
libseccomp
|
||||
libmanette
|
||||
wayland
|
||||
libwpe
|
||||
libwpe-fdo
|
||||
xdg-dbus-proxy
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
@ -180,7 +192,6 @@ stdenv.mkDerivation rec {
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=OFF"
|
||||
"-DUSE_WPE_RENDERER=OFF"
|
||||
"-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
|
||||
"-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
11
pkgs/development/libraries/webkitgtk/fdo-backend-path.patch
Normal file
11
pkgs/development/libraries/webkitgtk/fdo-backend-path.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -89,7 +89,7 @@
|
||||
#if PLATFORM(WAYLAND)
|
||||
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {
|
||||
#if USE(WPE_RENDERER)
|
||||
- wpe_loader_init("libWPEBackend-fdo-1.0.so.1");
|
||||
+ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1");
|
||||
if (AcceleratedBackingStoreWayland::checkRequirements()) {
|
||||
parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt));
|
||||
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name()));
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "11.30.0";
|
||||
version = "11.31.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dropbox";
|
||||
repo = "dropbox-sdk-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-w07r95MBAClf0F3SICiZsHLdslzf+JuxC+BVdTACCog=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mbBVivrpXYNuVbXeHRyy07LxPbtYvaL3JleK7QXOxi0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ecs-logging";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "ecs-logging-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-UcQh/+K2d4tiMZaz4IAZ2w/B88vEkHoq2LCPMNZ95Mo=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-2BfZ96D24sfjFD6l+gjp6xXbSJ0kjQD/FhHLI3bpVGM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lxmf";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "lxmf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9JG/EnL7vW4P7QiT6Xa0GLfmu1JeM0dlFSp3VRE47NI=";
|
||||
hash = "sha256-n7ZEXz+jFokjqQJf8feDE6wuN2kI3xB0z+guUhGse3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,24 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mox";
|
||||
version = "0.5.3";
|
||||
version = "0.7.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pymox.googlecode.com/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivancrneto";
|
||||
repo = "pymox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gODE9IGDk3WtO8iPOlp98fGp6Ih2laA3YlOHmq62m8Y=";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mox"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pymox.readthedocs.io/";
|
||||
description = "A mock object framework for Python";
|
||||
description = "Mock object framework";
|
||||
homepage = "https://github.com/ivancrneto/pymox";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nomadnet";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "markqvist";
|
||||
repo = "NomadNet";
|
||||
rev = version;
|
||||
hash = "sha256-WJpcV6+cnK1525lbYvkWqrGasioph72nuoNV4oWxVK0=";
|
||||
hash = "sha256-gqUCE35RPt7k0RAoZGJS1srB5K4v6gJkbTKQs8Lajm8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.88";
|
||||
version = "2.1.89";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lDUmudfs3Py4ytHsEvgnTiMvVQkom9X+uCeZHhTshjc=";
|
||||
hash = "sha256-7/rJe/A6CbkminjFuL+8eIdj0kYzNMKynWX0umAMRAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,38 +1,53 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, py, lxml, pytestCheckHook, wireshark-cli }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, packaging
|
||||
, py
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, wireshark-cli
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyshark";
|
||||
version = "0.4.3";
|
||||
version = "0.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KimiNewt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cveiFkkSplfQPgUEVWyV40KKHCtKJZsfvdV8JmEUmE4=";
|
||||
# 0.4.5 was the last release which was tagged
|
||||
# https://github.com/KimiNewt/pyshark/issues/541
|
||||
rev = "8f8f13aba6ae716aa0a48175255063fe542fdc3b";
|
||||
hash = "sha256-v9CC9hgTABAiJ0qiFZ/9/zMmHzJXKq3neGtTq/ucnT4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
py
|
||||
lxml
|
||||
packaging
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
wireshark-cli
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyshark" ];
|
||||
pythonImportsCheck = [
|
||||
"pyshark"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"../tests/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors";
|
||||
description = "Python wrapper for tshark, allowing Python packet parsing using Wireshark dissectors";
|
||||
homepage = "https://github.com/KimiNewt/pyshark/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ petabyteboy ];
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.7";
|
||||
version = "0.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-VdoAtY+uZ4M6UNjYplqxx8S11eyKzqypW7IYCXOO2kQ=";
|
||||
sha256 = "sha256-KEeTakVXt8a+SYbSGHOHAJwOa+T99qAIxAbvyMvb54A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.16.1";
|
||||
version = "3.16.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-XTt2R0JypbDGJtiWqFzmui7UVLK4/U46co7LcHkSbWo=";
|
||||
sha256 = "sha256-xecmza5Zsv6mJ4SCRl5VnGseKJG1yznBbLZ1tyBSjIE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2022.2.4";
|
||||
version = "2022.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-oWHyEw1DjMynLPAARcVaqsFccpnTk1/7gpq+8TU95d0=";
|
||||
sha256 = "sha256-XdPrKNUvAHsqw3nv7Ws2zBYDBqEOEeEUHLdB2+f+p+w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,16 +1,31 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testers, docker-credential-gcr }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "docker-credential-gcr";
|
||||
version = "2.0.5";
|
||||
|
||||
goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "docker-credential-gcr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY=";
|
||||
sha256 = "sha256-gb9c8qTHQWUOlaXAKfpwm0Pwa/N4iu48jWIwPYXD00k=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/GoogleCloudPlatform/docker-credential-gcr/config.Version=${version}"
|
||||
];
|
||||
|
||||
checkFlags = [ "-short" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = docker-credential-gcr;
|
||||
command = "docker-credential-gcr version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EqUaJHlZupk8CP0ob8pL5tAW/bzG38eZmA4hgTg1jYY=";
|
||||
sha256 = "sha256-R20mzPpbFDUw/wrif3ZJCt2wgmV+yqSkGaxyuw/9z0E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UAApPni4zIAQVOmPAah5vEE8kTrGaJ3irjtsukBNVHo=";
|
||||
vendorSha256 = "sha256-+Rj2hb9Sul5ntVGfuWf7JibKdG03zALiMWaaNTJFC8k=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -20,12 +20,12 @@ buildPythonPackage rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2022.04.08";
|
||||
version = "2022.05.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname;
|
||||
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
|
||||
sha256 = "sha256-h1jQFlCdRXS5D73pdapwra73HtXnoZUUFYj21pRSBbo=";
|
||||
sha256 = "sha256-OntZ0vtLOc6LqOC5xaN/4g5WJPRqI0a0rmarEyDjUTQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];
|
||||
@ -67,6 +67,6 @@ buildPythonPackage rec {
|
||||
you can modify it, redistribute it or use it however you like.
|
||||
'';
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ mkg20001 SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ mkg20001 SuperSandro2000 marsam ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, openssl, c-ares, libxml2, sqlite, zlib, libssh2
|
||||
, cppunit, sphinx
|
||||
, Security
|
||||
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
|
||||
"--enable-libaria2"
|
||||
"--with-bashcompletiondir=${placeholder "bin"}/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
@ -1,21 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, libpcap }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, libpcap }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "goreplay";
|
||||
version = "1.1.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/buger/goreplay";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "buger";
|
||||
repo = "goreplay";
|
||||
sha256 = "07nsrx5hwmk6l8bqp48gqk40i9bxf0g4fbmpqbngx6j5f7lpbk2n";
|
||||
owner = "buger";
|
||||
repo = "goreplay";
|
||||
rev = version;
|
||||
sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jDMAtcq3ZowFdky5BdTkVNxq4ltkhklr76nXYJgGALg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/buger/goreplay";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
|
@ -1,18 +1,34 @@
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
|
||||
, file
|
||||
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
|
||||
, withGnome ? true, libnma, glib }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk4
|
||||
, networkmanager
|
||||
, ppp
|
||||
, xl2tpd
|
||||
, strongswan
|
||||
, libsecret
|
||||
, withGnome ? true
|
||||
, libnma
|
||||
, libnma-gtk4
|
||||
, glib
|
||||
, openssl
|
||||
, nss
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
|
||||
pname = "NetworkManager-l2tp";
|
||||
version = "1.2.12";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nm-l2tp";
|
||||
repo = "network-manager-l2tp";
|
||||
rev = version;
|
||||
sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
|
||||
sha256 = "VoqPjMQILBYemRE5VD/XwhWi9zL9QxxHZJ2JKtGglFo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -22,20 +38,29 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ networkmanager ppp glib ]
|
||||
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file ];
|
||||
|
||||
preConfigure = ''
|
||||
intltoolize -f
|
||||
'';
|
||||
buildInputs = [
|
||||
networkmanager
|
||||
ppp
|
||||
glib
|
||||
openssl
|
||||
nss
|
||||
] ++ lib.optionals withGnome [
|
||||
gtk3
|
||||
gtk4
|
||||
libsecret
|
||||
libnma
|
||||
libnma-gtk4
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--without-libnm-glib"
|
||||
"--with-gnome=${if withGnome then "yes" else "no"}"
|
||||
"--with-gtk4=${if withGnome then "yes" else "no"}"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=$(out)/etc"
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
@ -49,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
description = "L2TP plugin for NetworkManager";
|
||||
inherit (networkmanager.meta) platforms;
|
||||
homepage = "https://github.com/nm-l2tp/network-manager-l2tp";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ abbradar obadz ];
|
||||
};
|
||||
}
|
||||
|
@ -1,22 +1,22 @@
|
||||
diff --git a/shared/utils.c b/shared/utils.c
|
||||
index c978a1f..d2c36cd 100644
|
||||
index 453e277..28716a5 100644
|
||||
--- a/shared/utils.c
|
||||
+++ b/shared/utils.c
|
||||
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
|
||||
@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path)
|
||||
const char *
|
||||
nm_find_ipsec(void)
|
||||
{
|
||||
static const char *ipsec_binary_paths[] =
|
||||
{
|
||||
- "/sbin/ipsec",
|
||||
+ "@strongswan@/bin/ipsec",
|
||||
"/usr/sbin/ipsec",
|
||||
"/usr/local/sbin/ipsec",
|
||||
"/sbin/strongswan",
|
||||
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
|
||||
{
|
||||
static const char *l2tp_binary_paths[] =
|
||||
{
|
||||
- "/sbin/xl2tpd",
|
||||
+ "@xl2tpd@/bin/xl2tpd",
|
||||
"/usr/sbin/xl2tpd",
|
||||
"/usr/local/sbin/xl2tpd",
|
||||
NULL
|
||||
- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec",
|
||||
+ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec",
|
||||
"/sbin/ipsec",
|
||||
"/usr/sbin/ipsec",
|
||||
"/usr/local/sbin/ipsec",
|
||||
@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
|
||||
"/usr/local/sbin/kl2tpd",
|
||||
NULL};
|
||||
|
||||
- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
|
||||
+ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd",
|
||||
"/sbin/xl2tpd",
|
||||
"/usr/sbin/xl2tpd",
|
||||
"/usr/local/sbin/xl2tpd",
|
||||
|
@ -1,35 +1,55 @@
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM
|
||||
, gtk3, gnome, libsecret, libnma }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, intltool
|
||||
, pkg-config
|
||||
, networkmanager
|
||||
, strongswanNM
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gnome
|
||||
, libsecret
|
||||
, libnma
|
||||
, libnma-gtk4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NetworkManager-strongswan";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0sc1yzlxjfvl58hjjw99bchqc4061i3apw254z61v22k4sajnif8";
|
||||
sha256 = "bbyA9qCboM9hBKMXhJWXgEFN13Fl4pY6zWZXwowlRMI=";
|
||||
};
|
||||
|
||||
buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ];
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config ];
|
||||
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
buildInputs = [
|
||||
networkmanager
|
||||
strongswanNM
|
||||
libsecret
|
||||
gtk3
|
||||
gtk4
|
||||
libnma
|
||||
libnma-gtk4
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--without-libnm-glib"
|
||||
"--with-charon=${strongswanNM}/libexec/ipsec/charon-nm"
|
||||
"--with-nm-libexecdir=$(out)/libexec"
|
||||
"--with-nm-plugindir=$(out)/lib/NetworkManager"
|
||||
"--with-nm-libexecdir=${placeholder "out"}/libexec"
|
||||
"--with-nm-plugindir=${placeholder "out"}/lib/NetworkManager"
|
||||
"--with-gtk4"
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN";
|
||||
|
||||
passthru = {
|
||||
networkManagerPlugin = "VPN/nm-strongswan-service.name";
|
||||
};
|
||||
|
||||
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN";
|
||||
|
||||
meta = with lib; {
|
||||
description = "NetworkManager's strongswan plugin";
|
||||
inherit (networkmanager.meta) platforms;
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kube-hunter";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-W7jW0V91o164EIAzZ7ODWeqTmUaUFDIqlE37x/AycqY=";
|
||||
sha256 = "sha256-+M8P/VSF9SKPvq+yNPjokyhggY7hzQ9qLLhkiTNbJls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+yoxpdEU5TDOJsLRXBwddzAIBAzdSu8hdcvhuCWZxtc=";
|
||||
sha256 = "sha256-ra8BxM+zpe5UKlJ28wc8yE5ta4ro4o2OHfmu9fBqFTA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6BC8jf/XaC7W6vsQEFIyIZ0S8XLJv+dFlaFl9VEO7yc=";
|
||||
vendorSha256 = "sha256-4E9nHBaojkOwnSPxRn2JGFcQTF4WowTOtzE5zRjkqhk=";
|
||||
|
||||
modRoot = "./v2";
|
||||
subPackages = [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O4oLtbijTAgUD+X3rxJkH2VmWLX5nQaN5JwoznNpKOM=";
|
||||
sha256 = "sha256-up79ryjN9WciEl6fVgTLUZHhXSu7+utQB2ACPAx207E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dfd5yQ3t23YyFin770UlCtEIldRxTqeWfgl0GLLF+Qw=";
|
||||
vendorSha256 = "sha256-EfHcCk2NkicSPeJYgHJT2kh9EwLldksET75ZQambrWA=";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "2.16.0";
|
||||
version = "2.17.0";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
@ -11,10 +11,10 @@ buildGoModule rec {
|
||||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kqyktQxQX4/jBj6vBw1VXRzD5D3wfLwnfi+QKgEqN5A=";
|
||||
sha256 = "sha256-PUaIx6rEaLz0HUxkglsVHw0Kx/ovI2f4Yhknuysr5Gs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EFuzbSVIhsGUJ8a2YoQHOq7BQpOHV43r9VKynR8UZ7k=";
|
||||
vendorSha256 = "sha256-zdgLWEArmtHTDM844LoSJwKp0UGoAR8bHnFOSlrrjdg=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $data/share/vale
|
||||
|
@ -29886,6 +29886,10 @@ with pkgs;
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
temporal-cli = callPackage ../applications/networking/cluster/temporal-cli {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
|
||||
|
||||
tendermint = callPackage ../tools/networking/tendermint { };
|
||||
|
Loading…
Reference in New Issue
Block a user